I feel like a broken record lately, but I'll throw it out there anyway! Before you spend $$$ on upgrades, try adjusting your air pressure--chances are that it is a contributing factor if you are running at max, as many do. Try lowering it in 5psi increments and try running the front 5 to 10 psi lower than the rear. Or, if you can fit wider tires, that might help-& again, don't run them at the max. Might be all that is needed. Worked for me on my road bike-I thought running at max was faster until someone advised otherwise. Tried lowering from the max, and it's not only not as jarring, but faster also.