one possible remedy would be to invent single gang switch plates that take a toggle switch and single NEMA 5-15 receptacle along with matching devices ... and always install one of those at each door.
My old house is wired that way (with a duplex and switch) in the two douwnstairs siderooms (one converted into a bathroom), and one in the big room upstairs, that one being the only recepticle upstairs.
