I'd use a VW TDI engine. This engine will likely be more advanced than the Toyota diesel, meaning more power/Liter and better efficiency. However, this would involve a bit more engineering work.
Why don't you work out the bugs and give me some blueprints?