I am the last one to talk about "needing" up grades, guilty as charged, but I would suggest you go for a ride on a new bike of your choosing. That way you can see if your thinking is warranted or realize your much better off than you thought. Try not to jst go on feel but try to get some data to back up your experience. For me it has turned out to be me as I am the limiting factor in my performance not the bike. Good luck and let us know what your decision is.
Frank.