It's a slippery slope, because if you get a new wheel, you can get more gears. I'd get the Velo Orange Grand Cru 126mm wheelset and a nice 7spd freewheel.