I go with Witch. Some of my beliefs are compatible with Wicca, but I am a solitary and in my mind I am and always have been a Witch. It causes some problems when people ask me about my personal beliefs - I got cornered by a church group doing a street survey about beliefs (all sorts of local beliefs, not just Xtianity) and I have a policy of not lying when it comes to my beliefs (even if it would give me an easier life

) so I told them straight up I am a Witch. I thought it would be correct to give my preferred title as it was a religious survey, however, needless to say, it did not go down well
Nevertheless, I still call myself a Witch and I readily identify myself with that term. I will stretch to Pagan, however, if I don't want to totally alienate the person I am talking to

My immediate family deeply object to the term Witch, however, I always use it to describe myself when we discuss it because I feel that being my family they should just get used to it and get over it. With people outside my family and friends I am prepared to use the term Pagan as discussion opens and then use the term I use myself when discussion is underway. A lot of people find Pagan easier to conceptualise than Witch - at least a Witch of the non-pointy-hat wearing and warty-nose sporting variety!
"If you trust in yourself and believe in your dreams and follow your star...you'll still get beaten by people who spent their time working hard and learning things and weren't so lazy. Goodbye." - Miss Tick, Terry Pratchett's Wee Free Men