Thanks for the replies guys. I did some heavy work on M&W, more along the lines of the Robb Wolf program he designed for his in-laws (letter to Art Devaney referenced in the Hybrid training thread). 3x5 DL, BS (different days), that sort of thing. Then a heavy, short metcon.
I'll definitely start playing more on the rings. Working to keep the rings strictly parallel on dips will be a challenge.
I think I'll do this heavy work for about 6 weeks (as of the start of this program, the games were 14 weeks away), then lighten up a bit, not a lot, per Derek's suggestion, for the remaining 8.