Thanks for the detailed post Lizzie, we've got similar issues so it was good to see your reasoning.
one question:
The conversion to a normal discretionary trust will cost you CG tax when the unit holder sells the units. In your calculations would that still make sense (eg. CG tax vs tax...