Sounds like a good plan. The only question I would have would be "How long will you live at this location?" Homes with built in aquariums can sometimes have a hard time reselling.