Looks like that will be the route I go. A lot involved in swapping a diesel, tho it would be badass. This guy did it

Montero diesel swap


99JAOS2"& OME 2"body 4.90s ARB HS9500i Skids&Ladder 16"315BFG JAOSRemote& Rack 3Row Rad IPF back& Searchlite HID Overhead Console/CB switchPanel FrARB RrLocker TJMSnorkel 160AAlt Sliders 2nd Tranny Cooler QuickAirII& Tank Rear frame/tank Lift