Since they made it seem like Roman will punish Jimmy if Jey doesn't return, how about have Roman about to beat down Jimmy on Smackdown next week, only for Jey to agree to rejoin and face KO/Sami in order to save Jimmy from punishment? You get the match without Jey need to just go back to full heel, and you come full circle with the callback to Jey giving in to Roman in Hell in a Cell when this whole story was beginning years ago, when Jey said I Quit to stop Roman beating the shit out of Jimmy.
I feel like they should probably do SOMETHING to get to the match pretty soon.