Hi, iamGigi2, and welcome to this great forum. It's good that you have done some research, that's the way to go.
Sounds as if you are definitely on the right track. Best of luck with the new hoime and larger tank.
I've presently got a 29G and am also planning on getting a larger one, provided you all help me to convince my wife. lol
Lovely little 29Gal FW community with 3 Danios, 4 Neons, 4 Serpae Tetras, 3 Plattys, 3 Albino Corys and 2 Male Dwarf Guoramis. All of whom enjoy swimming, tennis, golf and Bingo on Tuesday nights.