Sounds like a good upgrade path. There are typically lots of folk posting tanks/systems that would meet your needs and I'm guessing some will likely chime in here. I know one poster, Ron, has had multiple tanks listed that could work for you so maybe take a look through recent classified threads if you have some time. Good luck!