If the 7m is still strong why not keep it? It's a great platform IMO. Make sure the head is torqued down good, fix your wiring problems, 3" DP and exhaust, intake,safc or similar, and one of drjonez's MBC's and boost 10-12psi on stock setup.
I love my 7m and see no reason to go 1j/2j. Just...