For airworthy stuff in the US, I'd also add Old Rhinebeck in upstate NY. These are working aeroplanes dating between about 1909 to 1939 and the accent at the regular (every weekend or every other weekend) airshows is on fun.
The strip carved out of the woods has to be seen to be believed. And don't forget to visit the Quonset Hangars on the other side of the road above the car park - the contents may not be flying this year, but they reckon a quick rag overhaul and they could be.