The tank should still be ok for a while longer.

When you upgrade get a tub or "latchbox", not another tank.