You mentioned a move in the near future and an upgrade to a larger tank. Well now is your chance. I think you may have more hassle moving the tank a small distance and trying to keep forgein dust and what not out. Sell it, enjoy the cash and when settled in your new place, start your build
We all love our tanks but sometimes lifes little bumps get in the way. There can always be another tank (bigger & better)