Yeah, eventually just do all gender everything. It probably won't happen anytime soon though.

Would a male to female person in transistion stay in a female berthing or a male berthing or would they set up berthings for the individuals?

For most gendering issues like this the ultimate solution is to just get rid of the gendering. That probably won't happen for some time in the military but it's ultimately what needs to happen.