Simple design rules for any aerobatic plane > Thrust line, tail plane and wing all rigged zero incidence. It will always fly like that, but not perfectly. Then trim by possibly increasing wing incidence if symmetrical section - not normally needed. Thrust line normally a little down to maintain level flight under full power and low power without trim change, and to one side (?right) to maintain true full vertical flight without any trim changes.
Hope that helps with the rebuild. Eddie ex F3A FAI flyer. Have a look at GBR/CAA website for trimming tips.