I measured upright.

Previously my CG was same as Andys, moved the battery to the fire wall from the wing tube. This made very little difference in the inverted feel of the plane and settled it down in wind some, I would try further forward If I could easily do it. Stall turns got easier.