Sounds to me like either a seal is bad concerning the cylinders or maybe your piston rings are going bad. 30K miles means nothing if the engine was abused the whole time.

Doing a swap to the same motor just doesn't make sense to me. What was wrong with the old one? Why don't you use the old one (since you still have it) and rebuild it to replace the one you have now?