The same procedure as on the left side now on the right side to replace angle 25 and angle 4.
Removing the rivets is a bit difficult but went without any damage to the existing holes:
A chamfer was sanded to prevent a conflict with the rear angle:
There was a 1.5 mm gap between the outside of the angle and the firewall strip, this would we be visible when the skin will be installed:
After machining the doubler and priming all parts it was time to shoot the rivets: