koby, welcome back from the brink of disaster!
mistakes can be made brother, its only natural, especially with this branch of the hobby. Good thing is your wiser & more determined because of it, & thats ultimately what matters.
It does sound like you have a plan in motion. Just a few things from me or maybe just the distant voice of reason that may or may not help ok.
Upspecing your tank, to which i have know idea what it looks like may be a good thing or a bad thing, good being it can save headaches latter as others have suggested, or bad being all that extra money expenditure wont make up for the learning curve & pure routine. Reliance & stability comes from within, not your new equipment if you know what i mean. & its not just Zen talk ether..lol
Yes id prob agree - that upspec pump will be stronger & last longer & might save you moving something down the track to fit it .......... ummm wait here a sec...............* Veriann turns Koby into a thought process*
let me take you on a journey into my mind.......not that room bud, its X-rated in there

.......In here you have the opinion room
*Pushes you in & locks the door behind you*
lol
What my wisdom suggests that would cover all bases & is far better to spread your greenback dosh would be on a quality test kit, refractometer, auto top off unit & constant supply of quality water. Having this few pieces of equipment will make it possible to keep any animal alive in the bath tub if you catch my drift, because the rest comes from your understanding & applied knowledge.
although your the first person ive heard of using pillow stuffing..lol
Good luck bud, we're here to bounce things off anyways