I'm the biggest Shane O' Mac mark ever. I was so hyped last year for his return, got me hyped for 'Mania.
AJ styles should not be touching Shane, at least not at mania. It's easy to save it, they have Nakamura just sitting in NXT. Have AJ just wreck havoc during every smackdown main event until mania, and then have Shane announce he's bringing in Naka to put a stop to AJ's rampage.
In the meantime, AJ should just do exclusive squash matches, just breaking everyone with a different move each week, leading up to the match.
You could even hotshot the title on Naka, to make AJ even more pissed off, and then let them go for like, an hour.