I'm a little torn between the first and second options, but if it were me I would keep the old setup. It's hard to ignore the want to start over, especially once your almost done, and maybe I'm just lazy but all that extra work seems like a lot to do when you're trying to build a frog rack.

I say go with what you got, you're frogs are probably happy with your amazing tank building skills.