I have some doubts whether just moving the SIM card from the T-Mobile gateway to a modem/router would result in significant improvements. If you do try it out, please let us know how it goes.