Delivering a pedigree to Shawn would help build up some tension.
I'm not sure that would be a good idea or get Rollins cheered.
But I do agree with you that Rollins should be moving away from what Reigns, Owens and Jericho are currently doing to embark on his own angle. Even tho I could see them having him interfere to help Reigns in the handicap match.
How I'd book it and get Rollins some face reactions is have him in the ring with HBK, acknowledge and say
"HBK I respect you,I have no quarrel with you, however your ego maniac of a friend is too busy posing for pictures on social media to respond to my threats and demands so now I have to anger him and force his hand. *pedigrees hbk*"
If they let Rollins get that "kayfabe/4th wall breaking" reference he will at least get a pop from IWC in attendance and casuals feed off the energy so they'd go along too.