'46, I think you are right about non detergent is the safer approach in that situation.
I'd be really tempted to do several oil changes in a row, first one with only enough run time to warm the engine. Maybe first one with non detergent, then step up to detergent oils. At least this way it'll be cleaner when I tear it down for inevitable rebuild.