The 87-95 Wranglers are like ours... If you need any pics of how our 4.0 fits, just ask
You can search for other conversions as well.
I would start by making a list of everything you can find that is the same -vs- everything that is different. Your on the right track, find out the big stuff first. If you need to weld anything at all, it would be mounts...
Do you have other parts from the 4.0? Such as radiator? Alternator? Exhaust manifold? etc... It would make it a much easier swap to use as much as you can from the 4.0.
And... Welcome to the forum!