Chris,
No. Emphatically NO. You're doing too good a job as it is!
A door through from the waiting room should be ample.
Pax should not be in the WR without first purchasing a ticket from the ticket window, quick about turn, through the general WR a smart left and into the ladies. Simple. One more door is all it takes.
Ian
PS I'm in N so these touches can't be so easily done and that's why I have been enjoying your build! id