Clearly you need some gender neutral nickname that can be used before you know and after you know when it's so stuck you can't stop using even though you know and there's a name now.
Since we're contracting, I've kind of been burying myself, but I understand what you're saying. Normally we're in a similar sort of boat.