I'm now using a Pinnacle Waterless Wash as a clay lube. It's superior to ONR and it's as cheap as ONR (just about). I couldn't see claying with water to avoid cleanup - as I'd be worried about excessive marring. Also, IMHO - cleanup is a necessary step after claying.
After you clay, just wipe the car down with a waterless wash. All the heavy abrasive particles should be off of the surface and you are just removing the spent clay lube.
I don't even dry when I clay. Waste of time. Since my clay lube is made with DI water and I know I will be wiping the car down when finished.
I feel you need to wipe a car down (or wash it) with a waterless wash after claying if there is even a modicum of contamination being removed. Re-washing via 2BM or rinseless is likely a waste of time. This is the perfect use of a waterless wash. As, this contamination will show up as brown sludge on your towels when you wipe it down. It's the abraded contaminant scum slurry suspended in the the clay lube. Just wiping the clay lube off will leave some of this on the surface - meaning the surface is less than clean.
I don't see how water only as a clay lube or avoiding post clay clean-up addresses any of these concerns or situations. But, these are my concerns and experiences - others may not care or be worried about such things.