As you were confident of reaching the field, I would have done as you did on the A/G frequency only as this has benefits of a) letting others in the circuit know whats going on, and b) less time consuming for you. I might have used "PAN PAN" x3 as well though, just to be sure I had everyone's attention!