We still use Snorkels , Paddles , PB and bands, and buckets .
I think snorkels are great for balance in the water .
Our dryland is our Bucket sets in the water.
We are the Same a little bit of both , warm same , main set , Recovery most kick,swim drill ,ready for the next set ,If doing 25s @30, 50s@60,75@115/30.
As like you we have 6/8 per lane, we have started using a pacer the last 2 weeks .