revised scheme

Jeffrey - another possibility for your consideration - Hasan

not bad„ then make the sudy larger and the bath in the gray area

could we please talk about the hammam area - Hasan