Stephen, that shop looks fantastic, I know just where I want to spend my next vacation now! I would even be happy just cleaning the restrooms for ya in that place!
You did an awesome job and your descriptions of your old shop sounds a lot like my shop now.
I did see one little issue though on one of the pictures with the lockers in it you are missing a trim piece between the top and bottom lockers just to the left of the door. Really makes the whole room look like crap, ya know

I would love to be in the stages of building a new shop but knowing my club, that aint happening. Heck I was thrilled when they bought me a 14X70 office building for $3,000 this last year. We actually have two bathrooms a separate locker room from our lunchroom and my office doubled in size to 10'x10', yea now I have to get up to reach the other side of the room! just kidding it is really 12x14 but that is almost double what I had and we have central air and heat (never had that before) I almost cannot wait until winter just to have an office that is more than 5 degrees warmer than the outside temperature.