If your mast is at 90 degrees upwind, that could be taking a lot of shape out of the main. Try rotating the mast back so the limiter (or luff track) points somewhere between the daggerboard trunk and the rear beam...this is a more typical upwind setting and may give you some more shape.

Working/shaving your battens worked well on stretchy dacron sails - but isn't going to make a significant difference on pentex/mylar sails. The difference between the two shapes you have has more to do with how much curve was shaped into the luff of the sail...also remember that flatter doesn't necessarily mean slower. Sail shapes have evolved a little flatter over the last several years so it may just require some different tuning.