If you are feeling frisky, try using orange marmelade for your citrus. The sugar in it dries out the beer a little and the citrus flavor is smooth.
I actually used a 3 fruit marmalade last time: orange, grapfruit, lemon. It is fantastic in my BIG winter wit. Also has some chamomile and a touch...