I will be contrarian. Take the bike with the mod stem and go get a good pro fitting. Make the changes, ride it THEN map out the way to fit the yellow bike.
From the description on your physique and looking at the bikes I just have a hunch that a fresh look is in order.