If I'm cleaning only, I use OptiClean. But, if I want gloss or intend to QD after the wash, I will use Instant Detailer instead. It has plenty of lubricants and cleaning ability to safely use as a WW. It's just me saving a step.
Yes you can dilute opticlean or OID farther than the label says...