I wouldn't buy anything new until I proved that my existing shocks couldn't get the job done. A little time at the track shooting some video might answer the question. You have adjustable shocks now so it would be fairly easy to adjust them full soft and full hard and see how the car reacts. Then send the video to Calvert and see what they say.

The new Calvert shocks are 9 way adjustable so maybe that is all you need. Or perhaps they have tighter or looser shocks depending on what you need.