Sail doesn't have a good shape.
Using a tape measure with the sail laying flat on the ground I mark the sail at my max draft position. I use sticky back sailcloth, 3 on each side, contrasting colour to sail colour. I would relocate your tell tales to Max draft, one 15cm closer to the mast and a couple on the leech side of Max draft, same spacing. Should be easy to tune your sail with that setup and a couple of leech ribbons.
I read a quote from Dennis Conner once to the effect of "only an idiot uses the battens that come with a sail". Typically blunt but it is a good point. Battens need work too.
Darryn
Mozzie
1782