I finally got R2D2 back in the shop. It was sitting at 18* at the BB
Dropped it down to 0 at the BB and it drives great. I’ve not put a long ride on yet to see if that killed the diesel but I’m confident it will.
0 at the BB should be 7*. If this setting works you might try adding 2-4* (9-11* advanced) and it may drive a little greaterer yet still shut off without dieseling.