I traded my '01 2wd X in for the '06 XOR 4x4. The larger engine was very important to me, as the 3.3L was very underpowered - especially when towing my quad trailer. Going from 2wd to 4x4 was an added bonus.
In your situation, you already have 4x4. If you don't need/desire the extra engine power, I say mod the hell out of the Gen1.