Could McCain's Good Fortune Hurt The GOP's Congressional Efforts?

Two pieces of conventional wisdom:
1. Increasing awareness of pressing domestic issues tends to help Democratic presidential candidates, since they promise people free stuff. One of the easiest issues to work it's way into the forefront of American consciousness is gas prices, their rise would seem to help Obama.
2. In recent days the GOP seems to have found an effective stick with which to beat up Congressional Dems, by blaming them for not doing more on gas prices. "Drill faster!" seems to be an effective battle cry. This is fueled largely by rising prices.

Therefore, isn't it possible that falling gas prices (along with the current issues in Georgia) will help cement McCain as the better candidate to lead, while simultaneously taking away from the importance of one of the few issues the GOP members of Congress seem to be winning on? (Yes, yes, I know this ignores all sorts of other things like coattails, the perceived desire of Americans for divided government, etc. Shut up, it's my blog.)

If this is true, here's an interesting question. Would you rather the GOP do well and McCain lose this fall or vice-versa? At first thought, despite my better instincts, I think I'd rather root for McCain. That may just be the liquor talking though...