HHH vs Michaels at Wrestlemania would be awesome.
There was talk of turning DiBiase face in time for the release of The Marine 2, so they could maybe work with DX, where Ted turns face and Shawn accepts him as friend. HHH doesn't believe he's changed, and over a series of weeks Shawn comes to the aid of Ted instead of HHH. Eventually HHH gets sick of it and turns on Shawn (think Barbershop!) and teams with Cody. They could do all sorts with the 4 of them leading up to HHH vs HBK at Wrestlemania, with DiBiase vs Rhodes also on the card somewhere.