I have another approach if desired:
Of course, the measurements are not quite correct, and I also omitted wall thicknesses
I adjusted the floor plan as I would build it because basically I like your planning very much, I also adapted the ground floor for myself
Definitely goes into my "Ideas Folder"
Edit: OOPS incorrect orientation or labeling then upside down