Here is the 6 bolt swap Tech Article that Thor was talking about...
6 Bolt Swap into a 2g
I don't remember what all it says about it in the article, but I do know that I used a 1g oil pump and housing on my 6 bolt when I did my swap. I don't even think the 2g pump and housing will line up properly to the 6 bolt. But I could be wrong there...
You don't have to do any mods to the motor mounts at all. You are using your 2g tranny and just use the stock motor mount positions that the tranny uses. On the motor itself, (6 bolt one) you just use the driver side motor mount. You can disregard the stock 1g motor mounts on the back of the block.
Hope that helps ya out some more in clarifying things.