Thanks to you both for the feedback. It's much appreciated.
For the record, I didn't switch it from BB to DB. Waterbury's Submission Complex was already DB, and I liked that aspect because it was different from most other complexes I'd seen, which makes it easy to do in my living room
I'll definitely be incorporating your complex into my "gym day" complexes, Bushido. I like the looks of that one! Thanks again.