Very interesting Prospero.

Could it work in the first diagram to reconfigure the toilets/galley/etc at the front of the cabin, in order to protect WT+ seats? And in doing so (please don't shoot me), reduce the number of toilets for CW? What BA gives with one hand...