I'm glad I don't watch RAW anymore [well I watched the opening segment, and watched a movie] because the show has been a mess for months now. The creative process on RAW is a joke look at the Bayley/Sasha crap they've been doing since WM...
As far as the Lesnar contract situation goes, if he really isn't going to be defending the Universal Title at SS (I'd be surprised if he didn't) vacate the title and create a tournament and the Finals wrap up at SummerSlam.