Unless money is an acutely limiting factor I see no reason why you can't work on both the bike and the engine. I found I was spinning out on long (1/2 mile) gentle downhills at speeds bearly breaking 30 mph.

I feel that I got immediate results by increasing the size of my middle and outer chainrings, and I'm now improving on those results by learning to spin faster and more efficiently.