Whether you renew your contract or not, you will be still using Unifi for the next two years.
If you were to buy your own router, you will buy a good one. No point buying a low end model which will bring you the same problem.
Oh, modem is life time warranty from TM. Don't need to buy the modem.
Router is the one you can get your own.