Is the WWE building up a future rivalry between John Morrison & Shawn Michaels?

That's what it looks like. Morrison is already using the superkick more often, and helped his tag team beat HBK with that move. I think that would be an excellent feud, Morrison is great in the ring..and could learn a bit more from HBK while feuding with him. It's definitely a feud that could elevate Morrison closer to Main Event status...which is good since WWE needs more fresh main eventers.