I am rowing in the same boat... Took a long time to get a DFS consistently.
If I gotta be close for 24hrs, I will final buff on an aftershave, usually a balm type.
~Richard