Pointing ability is a tricky topic. It has a lot to do with sail shape, ability of the hull to be driven, conditions, foils, etc...

Righting moment is not just about hull beam, crew position is also critical. In the marginal stuff, maybe you could try sitting in off trapeze and flattening the sail shape, point a fraction higher, taking the form drag out of the rig...see what happens, it can't hurt to try it. Then again, I could be talking out of my butt, I'm just throwing up ideas here.

The best option is to find a similar boat with similar speed and do some two boat tuning. There's plenty of resources online to help develop a good testing regime. One day of useful two boat training will bring boat speed results, maybe even to the point of chasing that pesky A-class.