The core of my bag is my valk, teebirds, buzzz's, and putter so I'm comfortable with my game 350 and below. I am trying a few faster drivers to get a little more distance, in the competition are Avenger SS, Surge, Surge SS, and Flash. I hate large rimmed discs, never get a good release and so I don't care for anything bigger than the Surge rim.

A PD in S or C plastic will fight headwinds just fine and be so much more controllable than an XCal. It will also work wonderfully on forehands. Using a disc like the XCal for headwinds also means that you are going to get monster fade, sacrificing accuracy and placement. It also means you could be masking OAT issues on forehand (and backhand, but less).

My 175 C PD will hold a good line and still fade hard into a headwind, with only a tiny bit of movement. I would suggest picking up something like that for headwinds. Others might suggest a Firebird, but I personally think they might be as much overkill as an XCal, and I have the same D as you.

Someone recently posted a story about playing in a league round with a guy who threw an older 6 or 7 speed disc into the wind with more hyzer, while others opted for super overstable stuff. He parked it with his disc (which was in fact a "wind fighting" disc, just less of one than others), and everyone else hyzered out really short and way off to the left. Take that as you will, but I think it's a great example of learning to play with the wind instead of discing up to something like an XCal.

Other than that, it looks good to me...except I would drop the Monster because it seems to be in the same category of the XCal in terms of whether you really need it.