It’s up to you, and it sound like you aren’t a year round golfer… so getting fit tomorrow isn’t a huge priority.
As a retired shaft nerd, I love the old matrix black tie, but they famously had some issues towards the end with consistency… depending on which shaft you got, that might not be a great shaft… I have a tour issue none that I love, though… just depends on the age and source!
My personal path was to try stuff on my own, but various shafts online and sell what I didn’t like and keep what I did… I may have $500 in shafts in my house… probably could have gotten fit! But I enjoyed the search and found doing my own research and trying things to be quite enjoyable.
Over that time, I have worked on my path and improved my swing… one of the things that got me to the range was trying new shafts!
The r15 is five years old… nothing wrong with looking at upgrades. You can get fit, for yourself or wait until you are swinging “better”… all three have positives and negatives… you are unlikely to buy a bad new clubhead, and shafts are easy to change.
One of the biggest factors in my swing is how much the shaft weighs… if I go below 70 grams, I’m in trouble. You might have a similar equipment issue that’s adding to your woes.
Get on a launch monitor with a ton of options and go have fun… if you see noticeable improvement with something and it feels better… consider getting fit.