I'll recommend the swap to you (I keep saying it... hoping someone does it), Use the Audi 5 cyl diesel that came in volvo sedans in the 80s.
The VW/Audi IDI diesel engines are semi-modular, sharing some parts throughout the 3,4,5,6 cylinder versions.
The 5 cyl was only available in US in the Audi 5000, for a few years, roughly 79-82. They were NA the first year or two, then TD was offered optionally. TD was available longer in Canada.
Volvo bought the inline 6 version of the engine from VW truck. It is 2.4L, but only ~80HP NA in the 240 body, and 105HP TD in the 740 body.
They used the same transmission as a toyota mini truck, so you can use the inchworm toyota auto trans adapter to a mini truck transfer case, then a marlin rockbox setup to the LC case.
Both diesel versions were backed up w/ the Volvo M46 cast iron toploader four speed w/ optional electric O/D. The ZF slushbox was available optionally.
The B23 gas engine family, which is a volvo design engine, is available w/ the same Aisin/Warner automatics that were in minitruck. The manual trannys are again the M46 or M47 5speed. There have been some conversions done to install the toyota supra 5-speed behind the highly modified turbo gas engines. But there is no reason for a conversion BH to swap a toyota tranny behind the diesel, because the diesels are nowhere near the limits of power for the cast-iron Volvo tranny.
There are adapters available to bolt a toyota or sammy transmission behind a VW 3 or 4 cylinder, but there are none AFAIK to adapt the 5or 6 cylinder to a toyota transmission. The two engine families are very differnt looking at the ends of the blocks.
Is this too far off-topic?

Sorry.