Pumpkin Ridge for 20 years.
Don't let John fool you. He's just being nice about Waverley. He has many times professed a preference for modern courses over classic courses. Just look where his memberships are.
First of all, one reason I belong to modern clubs is that I'm not a blue blood, with no familial connections to clubs of high repute. Modern clubs need members, so they let the riff raff in.
Pumpkin Ridge is very close to my home, and I like the two courses there very much. I like the country setting. But the upgraded Waverly course is very nice. New bunkering, wider fairways, and very short green to tee walks. Plus the unusual 3-5-5 finish along the water is sensational. It's already the premier club for the older, well heeled Portlanders, and I imagine its stature will only grow with the changes.
This spring I toured the course with a friend who was on the greens committee in 2007-8, when they decided to renovate the course. He helped convince the committee to renovate then; since the economic situation was bleak, they had a better chance at hiring a top notch architect for the job.
According to my friend (FWB), they interviewed Gil Hanse, Tom Doak and Tom Fazio. Not surprising that Mr. Fazio suggested the best use for the land was to build an entirely new course. This was briefly considered, but eventually dismissed. So it came down to choosing between Tom Doak and Gil Hanse. My friend thinks that hiring Hanse would be much more difficult today, given his recent successes at Castle Stuart and the award for the 2016 Olympic course in Rio.