If you can't find anything you like on ebay, be sure to look out for just plain glass aqauriums (if you have the space and dont need a stand), they can come very cheap compared to the branded ones such as Juwel.
I'm afraid not quite. It's barely 20 gallons - and 30 gallons would be an ideal setup for your fish. So wait a bit longer and fingers crossed you find exactly the right tank