Not sure if this helps---I make something for my hair that I put in a mister bottle for a leave in conditioner, but I don't have any oil in it. I put in aloe, honeyquat, panthenol, protein, and bamboo extract. Just 2% of each. You need a preservative too, of course. I tried polyquat 7 as a detangeler, but did not like the way it felt on my hair.
If you wanted oil or silicons in something, you can emulsify with BTMS. I get most of my hair care ideas and recipes from swiftcraftymonkey. She has tons of info. Just google that and you will get to her blog site.