Thanks for the tips, I found them useful.
Have you also tried lifting the daggerboard? I pull mine up until I can see the 1. This makes a huge difference. My thinking is that the optimum daggerboard size is smaller for the smaller rigs and lighter sailors. Following your useful tips gives a flatter sail than I would have expected to use for the conditions; flatter sail means that minimizing drag is more important than maximizing lift; so reduce drag by taking up the daggerboard a bit.
This fixed my pointing and doesn't add any leeway. I could then use a slightly deeper sail etc.
I’m still playing with this idea. Next I will try setting the battens so that the top of the mainsail is flat, might allow the outhaul to play more of a role, and would effectively be lowering the drive point on the sail, so the daggerboard would come up a little more.
I tested in light, medium and strong winds, it helped in all cases.