Canadian side has Whirlpool, a Stanley Thompson muni with lots of bunkers (at least from the air). Buffalo is really short on public courses but there are many good private ones including Crag Burn, CC of Buffalo, and Park Club, play them if you can get on. On the way to Rochester, there is Mill Creek in Churchville (its on the thruway but not really close to an exit) that's very neat with lots of alternate fairway holes and wild greens, albeit with a couple goofy holes atop the mountain. Also Terry Hills in Batavia is a little known course, very short with a few too many trees but with several cool holes and wild greens. It's 27 holes, but play 1-18 (the first two nines) if asked.
If you're in Rochester, talk to John Foley about where to play (Greystone is the best public course near Webster), and the private courses are easily accessible, best is CC of Rochester or Oak Hill of course. Monroe is good but doesn't match up with the other two.