Smokinu, I think you have the spur gear size change backwards. If you're undergeared, you want to decrease the size of spur or increase the size of the pinion.

That will give you a smaller final drive ratio and will give you more top end, with the possible sacrafice of some low end.