Let the soil dry out more before you water again. Grab some 2 or 3 gallon pots for your upgrade. When you mix up your new soil for the pots I would add some perlite along with your soil. Also if you can pick up some blood meal, bone meal, and peat moss and mix that all in for a nice soil mixture.