That's exactly what I was going to suggest Whitechapel is very Lemony on me and fades to a kind of sophisticated vintage citrus blend as the day goes on.
Also I'm not sure if it's already been mentioned But Cheshire Cat from the Mad Tea Party is an intense Grapefruit on me ALL day it's feminine, fruity and lasts absolutely hours on me. The GC describes it thus;
<3