Hey Matt,
This is a work of art! I am looking into doing the reverse -- placing a petrol engine into a diesel. I hadn't located this thread and posted:
http://www.volvoforums.org.uk/showthread.php?p=1781406. Could you let me know what you think since you are the de facto expert on this type of thing right now? Much obliged, FlyHigh