I'm calling Heyman turning on Brock for the Strowman win. Brock's still a draw as a special attraction so I don't really see them having him put over Strowman clean before a high-tier babyface. And if it gives him someone like Heyman to be his hype man, Stroman isn't hurt in the slightest by his first title win having a "distracted" Brock involved in it.
Edit: Other booking option (I'd more favor this, tbh) would be to have Brock eek out a win like he did against Joe then have Strowman beat the everloving crap out of him after the match and kayfabe an injury that "forces" Brock to relinquish the title. This allows you to pull Brock off TV to save his dates, bring him back as a surprise RR entrant (and the roof will blow off the place if he comes out and Strowman is already in the ring) and can give you the option of doing the rematch at Mania without having to worry about the title being involved (it sells itself and it gives Strowman a massive Mania moment). Meanwhile, you can actually fill 3 hours of programming on RAW by having a bigger-than-8-guys tournament for the Universal Championship that crowns a winner either at Survivor Series or the RAW after. Gives you a chance to do some fresh match-ups without having to manufacture a storyline or feud for them or worry about babyface vs heel dynamic. Also, depending on where Joe is at in his recovery with his knee injury, you can actually push him hard as "shock" heel winner which gives you someone you can book around that easily carries you through the winter.