yes, still sounds good to me too - once you do your big water change and put a moderate stock of fish in, I'd be surprised if you have any problems, your biofilter should now have the capacity and probably will even drop back a bit because the fish will probably not put out nearly as much ammonia as you've been putting in.
After the fish are in you will just keep doing your same am and pm tests and if any ammonia or nitrite blips want to go above 0.25 then do a 30% water change or so and test again.
~~waterdrop~~