With Angle being GM of Raw and the current storyline that will likely lead to Stephanie and Triple H being back on tv it's only love logical to have Triple H vs Angle. It practically writes itself, they have Stephanie comeback to tv and bully Angle for a few weeks like she did with Foley. Angle finally snaps and stands up to Stephanie which leads to Triple H returning. Then we get Angle vs Triple H at Summerslam with Kurt's job as GM on the line.
if Angle does end up working more then I think Ambrose could compliment him well. They are both naturally funny on mic and could produce some funny segments. Ambrose is a safe worker and could be someone that could be trusted with Angle given his age and condition.