Test ride as much bike as possible, find out which one you feel comfortable riding with, after all it's about enjoying the ride.
then decide.
either that, or have a proper look at your bike, what feel off about it? can you pinpoint where on the bike that is off? is it something you can sort out? etc.
Yes, short listing the ones I can afford.
Thanks for an actual OT reply, Ed.