Do you think you could/will cope with the large water changes the way the tank is just now ?
Maybe you should invest in another filter , we all have one in the background waiting for use , and if you buy one to help with water quality in this tank and then when your new tank is ready , you'll have a back-up filter for your NEXT tank .
That site advisor I gave the link too gives you the option of telling it if they are baby fish or full grown , if you do the young fish set up does it give you more time to play with ?
When you get your larger tank your going to have to buy bigger , extra filters anyway , so why not invest in the big tank and let them grow into it to save you money in the long run , and the health of your fish .
Good Luck -David-