need to learn to sail in tampa area
I also sail in Tampa Bay (Bahia Beach marina) and my first boat was a Catalina 22.
I did the following (all at once) and perfomance greatly improved.
Tune the rig for correct tension. The Catalina 22 club (Main Brace) is good source of data.
What is condition of sails. New or reswewn sails do wonders.
Is the swing keel going all the way down and how fair is it. Mine was incrusted with barnacles.
Hope this helps.