Used No 7 for years and they've just changed the formula & its now crap. Bought a Lancome one this week and that comes off within a few hours. need a navy waterproof one which stays on all day - any suggestions oh wonderful beauty gurus of MN?