I would get rid of the under gravel filter for sure. HOB's and cleaning gravel with python much better. If you are unsure if the tank is cycled frequent water changes and use of Prime and Safe is a good policy. It takes about 2 months to get a new tank cycled IMHO.
