I would not want to go back to doing my photography in bathrooms etc. unless I had to. But I have done it in the same way that you now do.
I echo what Jorge said about a committment to the photographic process(s) as they now exist. Normally, the thing that makes most sense is to separate your dry from your wet side in doing your darkroom layout. The dry side would obviously include your contact printing area, your enlarger, print and negative storage. It could also contain such things as your dry mounting press, matting and framing area. Although I would make the latter in a defined area. The wet side would be film and print developing area, washing sink, and print drying racks. A wall segregating these areas would be nice.
Good luck should you go forward.