Just Scent
Just Scent has a really nice Lavender Vanilla fragrance oil that throws a ton in soy wax. I haven't tried it in soap personally, but I bet its great in soap to :)
Angel Type
I thought Nature's Garden had a pretty good Angel Duplication. OOTB it is not close, but once in soap, it is lovely and similar to the original!