Would have thought you'd be best using an emulsifier to get the oil and watery ingredients to mix a little. Perhaps one of the polysorbates? Or if you use gel add the oil to the gel (see YouTube Ecostyler custard recipes).
Diluted vinegar works because it's acidic and hair prefers to be ~4.5, do you know what pH your conditioner is? If it's appropriately low that will do the same job. If you are doing the right dilution of vinegar you should not need to rinse and there should be no smell once your hair is dry.
2a-2c, medium texture, porous/ colour treated. Three years CG, growing out mechanical and chemical damage = breakage and very high porosity. Past armpit length heading for waist.
Treatments: Komaza protein, Komaza Matani, coconut oil with sugar syrup. Hairveda Sitrinillah
Leave in: Fructis Sleek & Shine (old), Gliss ultimate volume
Styler: Umberto Giannini jelly, Boots curl creme, Rockin RInglets
Experimenting with: Mega-Tek, Curl Harmony reviver, Elvive Full Restore 5.