Hold off on them a bit. You're going to have the money this summer, so why don't you introduce your angels or Bgk to the new, bigger tank? Once you've got it cycled in, and you add your chosen fish, you'll see faster development, plenty of good swimming activity, and robust health in the bigger environment. I don't think either of these fish need a grow out tank, and if they get to be the first in the tank, these more delicate fish will have a chance to establish territories before you relocate your clowns.
Patience is darn difficult, but it really pays off in the long run. And this gives you tons more time to think about how you'd like to set up your angel/bgk tank. Decor, plants, substrate, filtration, flow patterns... Start making plans, but be patient.