On the subject of flow, the more rock, I think the more flow you want. I have a medium rock load, 2 x Tunze 6100, 1 x WP60, 2 x Tunze 6085 and a Maxijet for fun
I'm adding a second WP60 this weekend in the hopes that I don't have to baste the end pieces of rock.
FWIW, I think your before pic is better. Allows more flow and still has enough room to grow out corals.
IMO, the more rock, the more nutrient build up occurs.