Go meet with a professional to adapt your bike to you...
The stock settings on my bike were not correct for my body size and it was immediately visible to my coach, who is a
Serrota Trained fitting specialist.
He changed the stem on my handle bars and it really helped me out.
I would look at fitting your bike before buying a new bike