Nissan Repair: engine swap, apprentice mechanic, cold air intake

Question
hello, I have a 1986 nissan motorhome with a 2.4L engine(720 pickup front end,5spd). It is seriously underpowered, I was wondering if a nissan 3.0L from later models would fit, or if there is some kind of conversion kit to fit a different engine.
Or failing that, is there a way to get more power from the 2.4L?
I am an apprentice mechanic, so I could do some
modifications if need be.
Any help you could give me would be great.
Thanks
Dave

Answer
Dave,

Yes, but you would have to take the computer, harness, engine and transmission.  No, there is not a kit for the conversion.  But, you could go with a header for yours, shave the head for more compression and a nice cam for more lift and duration.  Also, there is a cold air intake and a K&N filter you could install.  You have opportunities with your engine that are less costly than a conversion and that is the way I would go.