Finished up both flaps over the last week. Riveting in the small spaces is very challenging, so I have ordered the long reach yoke. Life should be a lot easier with this!
For the second flap I have used an alternative sequence for riveting. Instead of putting the attach angles on first, I have riveted the ribs to the attach angles, which allows me to use the pneumatic squeezer instead of hand-driving each rivet. Immensely quicker and a more reliable result.
There is sufficient space then to use an offset rivet set to attach to the spar.