I wouldn't worry about the hot glue damaging the heat shrink, it can take some serious heat... Provided it's of reasonable quality.

The idea of the battery connector having both female sockets is to help reduce the chance of the terminals ever shorting out. I would do it the same way.. But, your logic about using the pins in alternating gender does ensure you would never connect them
backwards...