I mean, I would've saved Drew's win for the first RAW with a live audience and booked a no contest after some huge spot/bump left both him and Brock out of comission.
But I agree that Drew is far from finished and that when it goes south for him it will be because that's what Vince can't help doing with his face champions, not Mania.