Keep THE MAST RAKE, It has a lot of advantages!!!
Speed, pointing and less playing submarine!
Tacking and how it works:
If you are on a close haul bear off like 2-5 degrees to accelerate the sheet in max, before the boom goes to the middle of the boat ease the sheet and help with psuhing the boom with your back. Don't push the rudder to the max but start with slow rudder angle and push mmore the slower the boat gets.
Your weight should be as mach as possible to the stern when starting the tack.
If you are "through the wind" take the rudder amidships and slowly pull the sheet in position yourself slightly into the bow direction?
Try and try 30 times again. This helps.
Fritz