I'm glad you've found something that works so well. The other thing you can use to emulsify the oil (ie make it mix all through the water) is a little bit of milk (a tablespoon or two). Mix the oil into the milk, then add that to the bath.