Teach Soap

I am making lotion, and I have a problem I can’t figure out. I strive for a lotion that is not too thick because it is harder to apply. My first batch of lotion seemed great when I made it, but became very thin over time. The formula I tried in a second test is 80% water. The remaining 20% is a combination of sweet almond oil, grapeseed oil an emulsifying wax. By weight, the wax is about 20% of the combined weight of the oils. It was noticeably thicker than my earlier attempt. However, over time, it, too, has become thinner.
Do you have suggestions on what I can do to produce a lotion that is easy to apply and will not become thin over time.

Thanks,
Bill

Lotion Recipe General Recipe Guideline:
70 – 80% – Distilled Water
3 – 5% – Stearic Acid (or other co-emulsifier)
3 – 6% – Emulsifying Wax (or other emulsifier)
Add the rest in of your choice of oils and butters

To this add:
.5 – 1% – Preservative
.5% – Fragrance