Made up new attach angles, drilled and clecoed them to the spar, and continued to fit the tank ribs and baffles to the attach angles. After locating the tank on the new angles and fitting it in place to the leading edge and spar, I drilled the end rib and baffle to the inboard attach angle. Then the outboard leading edge was taken off the wing, giving access to the outboard tank rib, which was then also match drilled through the baffle and attach angle.
Pretty good alignment between the tank and outboard leading edge.
New attach angle in place, washers are to keep the screw from going all the way through the nutplate.
Drilling the inboard rib to the baffle and attach angle.
