Just glancing at the sail, it appears the draft at the top two battens are too far aft, 3 and 4 look pretty good, but should not be moved forward, Then the rest of the bottom of the sail has the draft way too far forward which will cause a backwinding by the jib (overlapped or self-tacking makes no difference -- the jib is still throwing air across the mainsail down there.)
Rick