it looks we have identical likes on summer scents(except eau sauvage!!!).
man eau fraiche is my no:1 in summer, so it's highly recommended.
l'eau par kenzo has even worse longevity than happy despite its great smell so keep away!!!
bvlgari aqva and aqva marine may be additions for ur testlist, both of them are (citrus) aromatic aquatics with respectable staying powers.
bvlgari extreme is another awesome hot weather scent with its crisp grapefruit accord and it is also one of the longest staying eau de toilettes i've ever had!
altitude from silver shadow trilogy is also worth to mention although it can't be called a citrus scent.u may also take a look at allure edition blanche.
ps story has a crisp grapefruit,ivy opening with some green rose in the middle and finally a dirty vetiver as the basenote, worth to give it a try...
i hope it helps