I vote for a new bike with "endurance" geo.
Get fitted for the bike before you buy it.

The way I see it, if you start with a bike that is closer to your end goal (by design), you'll be able to fine tune the fit that much more to achieve the maximum amount of comfort. For me personally, comfort = more time riding



Don't forget to slam the stem when you get it home.