Go with whatever is most comfortable. Don't worry over these little differences you are down to now with your fit.

From the side, my San Jose's stem looks a bit dorky but when I'm on the bike, I can't see the rise of the stem at all. And it's comfortable and I'm plenty fast. If I want to be more aero, I use the drops. Since I ride on the road, I use what works on the road.