Yes, that would eliminate most of the risk.
As to when you should draft the team qb position, that would depend on a few things. How does your league score for rbs? How many people are in your draft? What is your draft position?
If the top 5 or 6 RBs are gone, it might be worth a 1st round pick.
There is a much steeper talent drop off from the top at the team qb position than there is at the WR position.