When is the story line Between shawn michaels and jbl going to end for good?

i hope soon because it is really stupid. i am a huge shawn michaels fan but this has to be the stupidest story line he has ever been in. i think he deserves more then a rivalry with a trouble wrestler. if anything he should go to smackdown and have a rivalry with jeff hardy for the wwe championship. that would be cool only because both of them are one of the main event ladder match superstars ever. because that jbl rivalry is whack.