Choice of short term tank.

Due to being in between houses i have various small tanks on the go when i dont really have the room for them.

Therefore i need to fit the following fish into one medium size tank till november time when i will have fully moved and can get a large tank.

1 x large 8- 10" severum ( very placid)
3 x 5" holpo catfish
4 x 3" spotted silver dollars
3 x 2.5" Urau
1 x 2.5" jordans catfish
1 x 4" Bush fish
1 x 1.5" Dat
1 x 3" Poly

so i have the option of two medium size tanks that i have unused, but i dont have room for both of them to be running.

option 1 = 52" x 20" x 20" roughly 330ltrs
option 2 = 40" x 24" x 28" roughly 400ltrs

which of the two tanks would be more better?

current avalible filtration for these tanks are.

ehiem ecco 300 600 lt/ph
biopro UVF 2200 lt/ph
plus a homemade 700lt/ph canister/container


most likley i will just empty the media (mostly alphagrog) from all of these into a large pressurized pond filter with a 4500 - 6000ltr/ph pump and be done with swapping and changing filters all the time. I the hope of filtering the over stocked tank well.

anyone have a view on which tank would be better suited? have to make this choice tomorrow. Any help wold be great