I would say I most likely would have set up my own HT with multiple rows like the second picture but I think I would have added a second set of side surrounds. I would move the front set to just behind the front row and the second set placed just in front of the third row.

Jason
M80 v2
VP160 v3
QS8 v2
PB13 Ultra
Denon 3808
Samsung 85" Q70