Windy/overstable putter maybe?
No fairway drivers, how come?
Wraith/Surge/Nuke overlap? All distance drivers that do the same thing?
XCalibur really needed?

-Using an overstable putter for the wind is a good idea.
-I don't use fairway drivers because there is no distance I would be left with that I can't handle using my comet, Buzz, or Wasp. If I need a straight flyer that holds the line, my Surge SS is the disc.
-Wraiths are my control drivers, Surge SS is for An-Hyzers and Hyzer-Flips, Nukes are my long bombers
-XCal is my most predictable disc in my bag. I use it for holes that end up left, Headwind, or in a situation that I can't afford to turn a disc over.

I play at 6500 ft in Colorado on a regular basis.

Distances:
Drivers-throw between 400-540

Wraiths: throw flat usually between 380-420
Surge SS: Thrown Flat I throw about 400, hyzer flip I throw between 450-500
Nukes: throw between 500-540
Xcal-I don't try and push this past 430, unless in headwind
Z Avenger: more of a control driver for me, use a lot with headwind, and large S lines, never try and throw past 400 (I don't get a lot of glide with this disc)

It's the Power Driver from Discmania. (Euro spinoff from Innova essentially) It's a controlled distance driver. It has a smaller lip but I still get great distance out of it. There's a super thread on it here, I know you don't like fwy drivers, but I'd say try it out, you may dig it.

Haven't played in Montreal, sorry. Looks like there is only one course in the city too. Make sure you write a review for it!

I know you said your Comet does it all for you, but I just think a fairway disc could offer you something that the Comet cannot. What about a really low ceiling shot that you can't throw the Comet? Or othertimes when you just need a light touch onthe disc and still get a little distance from? Like a sidearm toss with 50% power? I like the Leopard for such shots.