I made my mind up! I was not going to risk the orange paint again so went for Tamiya's Lemon Yellow. As you can see it went on through the airbrush much better than the orange. The 3D print still has a couple of defects in it but I can live with that and with an eventual matt finish they will be less visible.
Whilst the yellow is a nice colour it does need some contrast so the buffer beams were masked up.