The gen 1 motor will work fine in the gen 2. Use all of the gen 2 computers. ECU PCM etc.
The spin on oil filter can be swapped over. The gen 2 valve cover should be swapped over as it is a better design and helps with crankcase ventilation.
Your issue might be more that a lot of the JDM...