I'm predicting the 90 stem and a nudge forward on the saddle fixes you up. Shorter reach bars with the same characteristics of your current ones can also help make the adjustment you need. I would not go to an 80 stem if that could be avoided. Let us know what happens.