You want vanilla that's not sweet and cinnamon that's not powdery? That's a tall order. But for the best of vanilla and cinnamon:
Jaipur: EDT over the EDP since it's less powdery
I'm afraid you'll have to tolerate some sweetness in both of thse but if you can handle LeMale, Carven and Antidote, they shouldn't be a problem. I would probably choose the Egoiste first as it's a little less on the powder factor.