Okay, all safe and sound!
Ended up taking all the rock out, but I managed to catch the 3 delinquents
They're now in a holding pattern in the Rubbermaid tub until they have a new home.
Here's some pic's of the B4 & after of the rock. I'm not sure if I like the new layout as much as the original, but I'm already seeing more relaxed fish.
Before:
After:
