I'd just discuss that with the sailmaker before I went down that road.

From your picture, it didn't look like you have a big shelf or roach on your main.

I thought the shape looked pretty good for moderate air. Unless your boat and that main really were pointing at 27 degrees True Wind Angle at an opitimum and not stalling -- I think that unlikely. Full battens which I like a lot, can mask trimming mistakes because they tend to keep the main in what appears to be a good shape. The sail doesn't luff as quickly and the tail (or leech) doesn't curl-out. Sometimes looking good hides mistakes. (A problem my face never provided me in real life. ;^)))) .)

You might also have your outhaul tighter (farther from the tack) too. You have a less things hanging-up you ablity to adjust and shape the main with a loose footed main.

Could be one or a combination of those.