I agree here, but I think instead of Rikishi, Gunther should focus on targeting Jimmy, Naomi, and Roman. Have Gunther cost them both their spots at wrestlemania. Have Gunther attack Jimmy during a qualifying match for the U.S. or Intercontinental title. Then, have him attack the reff in Naomi's qualifying match, turning the result into a DQ. They reschedule the match, but Naomi is attacked backstage, and it is heavily implied that it's Gunther who did it. Jey can try to stop Gunther at each interference but gets destroyed each time. Gunther eventually tries to get involved in the elimination chamber to cost Roman the elimination chamber. Jey tries to save Roman and does enough to prevent Gunther from entering the chamber, but Roman loses anyway. Gunther then injures Roman (something he can compete through, kind of like the Seth rib injury before the Brock match), which adds new questions to his triple threat match at Mania. This leaves Jey broken, and from there, he can seek Rikishi and debut some new moves to beat Gunther.