First thing to do is not touch the downhaul, the more downhaul, the easier the leach will open.

More pre-bend will flatten the sail and affects the first 2/3rds of the sail, I'm not sure if it will affect the upper part....

Maybe you could try and use a stiffer upper batten?

Gill