Industrial/organization psychology sounds like it would fit. You bring in the social sciences as well as some of the design of spaces, communication studies, and pretty much all of your noted skills.