I’d say the most effective way would be tank out and clean with whatever method of choice.
You could source a good, clean tank, put that in and be done with it too.
Very clever.
So rather than continue to reduce your hoarded inventory of Subie parts, you intend on hiding it in plain sight from your wife in the form of a Baja?