Great guide, great whiskey options, and a great learning experience.
Only thing I suggest doing is check the hotel options in Grantown-on-Spey and work with Rabbie's to find a good option that has good reviews. In the group I was in, we were split over a few hotels and not all were great.
Absolutely would do a tour with Rabbie's again and in fact maybe even repeat this specific one in the future.