The problem is your halyard slack length. The way to set it correctly is to hoist your sail on land with little to no wind...ideally, just enough to hold some shape in the sail when sheets are fully eased out. The retrieval line should be a bit more than needed to prevent sail deformation. Check both gybes and mark your line. If you're scared to cut too much, take a few extra feet and make a tail at the top sail patch...bundle the tail up to make it neater. You can also do this at the sail head. Now you've got some fall back. Also useful as the line begins to wear at the cleat point...you can shift the cleat point by passing line from the bundle.

Also, never release the tack line before the sail is down and partially in the snuffer.

I'd like to hear more about the mast track setup...any links to pics?

Mike.