I'd also go for bigger tires (at least 25) and raise your stem. I have used the Ritchey adjustable stem and it worked great. (I have an extra one, if you need it).