I would suggest the Advanced puppy, based on your description. I think the ability to try out as many new things (surfaces, agility equip) as possible is great!!! Also the fact that they're working on keeping it light-hearted for puppies sounds good too.
Often times a break (or layoff) from training is good for a dog. However, if you have really been enjoying class, maybe you could contact the training center and see if they'd let you pay a "drop in" fee and just attend a few of the Beginner classes until Adv pup starts. I have done this with Xcel.....when I want to get him working amongst other dogs (other dogs are a HIGH distractor for Xcel, he still wants to play with them), I call the place where I do most of my training and ask if I can drop in (and pay the appropriate fee) to one of their ongoing classes. When I do this, I make sure to follow the class schedule of that day, so as not to be disruptive, but it still gives us the distraction work that we need.
Congrats on PuppyK, glad you enjoyed it and are looking forward to more training! It's VERY rewarding to train a dog with good methods and see it all come together......watch out, we may get you in the ring yet.....that bug bites HARD!!!