PTP, it sounds like your luff tension might be a little tight but as you mentioned, that's easy to fix, either ease the tack line or halyard just a few inches and see what that does for the curl.

As a rough guide, if you know you will be heading very high with the spin up, on the very edge of too high, easing the tack or halyard will flatten the entry and allow you to cary it a bit higher than a tight (curled) luff.