When drained some additional oil poured out. This time I removed the injection pump thermostat hose to allow the system to burp. Filled the system and ran the engine. Eventually the idle speed began to slow as the wax thermostat began to move, at least it was getting the water/soap! The level in the expansion tank dropped about two inches and I added water at that point and shut her down. Tomorrow I'll drive the car a bit and nervously observe the temperature gauge.
On the flip side I've got this drain/re-fill process pretty streamlined.
