Have you thought about going through a professional fitting? I did that with a road bike I bought about 15 years ago and it worked out great. I actually ended up going with a longer stem, which surprised me. I also found out that I was humping my back instead of keeping it flat........not a good thing for long term riding. Now I'm back riding after a long layoff and recently purchased a Specialized Roubaix Elite that I really like. Once I get a few hundred miles on it I'm going to go in for a fitting with it. I hope it works out as well as last time.
Jim