Maya--do you like crossovers between those two categories? One of my other current favorites is Le Petit Prince eau de toilette. I think it's made for kids, possibly european, and to my nose, it smells like lemon-flavored sugar--almost like Froot Loops, in the best possible way. Lemon's hard, I find, because it can go to that Lemon-Pledge place really quickly, but Le Petit Prince is all of the sweetness and tartness of lemon without any of the floor-cleaner associations.
I know Fresh makes a "Lemon Sugar" or "Sugar Lemon" or similar, but I don't find it to be anywhere nearly as successful as Le Petit Prince.
For other citruses, though, Fresh is definitely worth a spritz. I like Hesperides, but it's a little bit more floral and perfume-y than something like Le Petit Prince.
Another gourmand (sugar-cookie-style) you might like is Lostmarc'h Lann-Ael. It's this beautiful sweet gourmand that doesn't have any of the artificiality or burnt-sticky-candy notes of something like Aquolina's Pink Sugar.
A lower price point might be something like TokyoMilk's Honey and the Moon, another sweet gourmand.
The warmest perfumes I know are Hermessence Ambre Narguile (a bakery, lots of cinnamon, with smoke layered somewhere in the middle) and Comptoir Sud Pacifique Amour de Cacao (chocolate, vanilla, a smidge of orange, all layered over a powdery base. Smells like a wooly sweater feels). I can't wear either one during the summer, but they're perfect for when the weather sharpens up.
For clean/fresh scents, Clean's Warm Cotton really smells like that perfect batch of clean laundry. It's similar to Demeter's Laundromat, but it smells more like clothes-out-of-the-dryer, and Laundromat is clothes-out-of-the-washer.
I also love love love love love Philosophy's Baby Grace, but that's not quite a citrus or marine fresh scent--but it's definitely fresh, just in a different way. Worth a spritz if you're in a Sephora.
You also might like the Bulgari tea fragrances--white tea and green tea, specifically. Very light and very fresh. There might be some musk basenotes, though, so that might not work.