Perhaps you already considered this, but could you not just remove the back of whatever units are not deep enough, and move the entire unit forward from the wall an inch or two?
The results might prove too ghetto mind you, but it would certainly allow for many options.
This IS the reason I built a Flexi all those years ago. I kept it in the room with my gear until recently, when I built up the basement and installed a media closet.