Right side heaviness calls for lateral balance adding weight to the tip of the left wing; that will solve static inbalance.

The trim to the right means that the plane has a dynamic inbalance, which means that the right side surfaces (wing-aileron+stab-elevator) are lifting more than the left side.
When the areas are identical, the surfaces with higher incidence respect to the airstream (AOA) lift more and induce a roll.
It does not take much angular difference to disrupt the balance or symmetry the lift.

To eliminate warps, twist the surface in the opposite direction while you hit it with a heat gun.

Measuring the LE's and TE's from a flat surface can be almost as good as using an incidence meter.