Ok, thanks.  I got the engine in and am swapping what parts I can from the ej25.  Switched the throttle body and several hoses that were rotten on the ej22.  When I went to drained the old oil out of the ej22  I found that the threads on the pan for the drain plug were stripped.  The question is, can I swap the pan and oil stick tube between the engines?  Or is there a way to fix the M20 thread on the existing ej22 pan? 
Kevin