Clubs seem fine, however As you improve it may be beneficial to check your distances rather than clubs and shafts. If you have a good spread across your clubs, and no big gaps, or tiny gaps it will help you have a set that meets the needs of your game.
If you have a decent practise area hit 10 balls with each club. forget the 2 furthest and 2 closest. Get an average of the remaining 6 for your yardage for that club. Do it for each club in your bag in you have a few clubs that go the same yardage or massive gaps you can get your lofts tweaked by a fitter for reasonable price.
