Sounds okay, considering what I know of your writing style, you'll get it right.I think I'll have Ranma evade the entire issue by asking to go use the restroom.
This, though, has me questioning things. I can see Ranma switching back based off of habit, but she's going to be expected to use the woman's restroom, most likely with Barbara escorting her. Barbara isn't stupid enough to just let Ranma wander around on her own since they're both still in the PDHQ.Once there he switches genders and tries to walk out, forgetting that he is wanted, leading to a big hoopla as he makes an escape.
I more likely see Ranma changing back on accident while directly in front of Barbara. She then has the choice to either restrain him or keep his secret until she gets the full story from Bruce. If she tries to restrain him, he evades her using non-damaging moves before busting out of the PDHQ, causing a commotion in the process. If she decides to wait, she'll have Ranma change back to female form and tries to escort Ranma directly to Bruce.