Definitely a shorter stem will help. Sounds like the whole ensemble (handlebars and shifters) is too far forward of the contact point of the front wheel.