Scott-
Knowing Garrett, I have seen what you described above and have to agree that he is a different kid this year. Best of luck to him!
As for my son, being a freshman and wrestling Varsity I think has really improved his drive. He is challenged daily in practice and weekly on the mat. Where in kids wrestling, he seemed to get bored after a while which drove down his drive. If anything, high school wrestling has replenished his thirst for the sport.