Sounds like you have a solid plan for making the switch. IMO, I wouldn't stick a clown in there, it is too small of a tank; however, there are some gobys that will remain small enough for your footprint. 5 gallons is more of an invert tank then a fish tank. Good luck with the setup and post some pics.