This'll sound picky, but when you reef the main, try to get lots of halyard tension, so the luff is really tight. Yours is kinda scalloped, result is a baggier sail that heels you without moving you ahead as well in a strong breeze.
Roller jib shape you can't do much about. But you can with the main. How are you rigging the jiffy-reef line on the clew? That might need more tension too.
"Flatter is faster" when the breeze pipes up. Meaning not just sails, but also heel (if you can). And if you have a traveler, use it upwind and on reaches--ease it and you can strap the main down hard with the sheet (helps get it flat) without having to sheet it too far in to the centerline, which will just heel you too much.