Sounds to me like all your ??? were answered. I would add one thing though. A 30% water change is wonderful. I personally do 50% each week. How much % has been an ongoing debate for decades! I guess my point is that even without the overstocking I still this weekly water changes is necessary.