Lightweight, centerboard, shallow draft vessels will need some help turning in choppy conditions, especially where current is adverse. Besides your sails and foils, get the shape of your hull involved. If the boat is heeled the hull shape becomes asymetric in the water, creating lift. Use you crew weight to heel the boat to leeward as you begin the tack. This will help the boat turn to windward by increasing the weather helm. Shifting the crew weight in a lightweight, centerboard boat is highly effective. It has a less noticable affect on fixed keel, heavier vessels.
With the crew weight to leeward, and the boat heeling, the weather helm will assist the rudder in the turn. Therefore, when you start the tack DO NOT turn the rudder harshly.. it will scrub off too much speed... Once you're confident the boat will make it through, you can finish the turn quickly. Bear off a bit to build speed before heading back up on the new course.
My final recommendation is to study dinghy and catamaran sailing techniques such as "roll tacking" to learn more about handling light weigt craft in various conditions.