If your still thinking about an IC, google frozenboost. They make air to water IC in plenty of sizes. You have a ton of room for one in the engine bay!
Been reading up on all the diesel builds, I'm about to score a low mileage FJ60. Gonna throw a 12 valve cummins in it ASAP