2 year old sleep issues!

DD used to be great at going to bed and sleeping through the night. Then she got chicken pox and was really upset and itchy at night so we started putting her into bed with us (hmm - big mistake!)

Since then she doesn't like going to bed and will stand and cry for ages until she drops off. If one of us goes in but doesn't pick her up and take her into bed with us or back into the lounge to sleep on our laps she will scream even harder.

I am pretty sure this is just a tantrum issue and she is angry because what she wants is to go to our bed (she even points towards our bedroom and says 'that way' when i take her to her room) and she is not getting her own way.

Anyway, my question is, do I just leave her to cry it out when she goes to bed and if she wakes up in the night? She can cry for ages and get herself in a right state and i am worried i am causing her distress and feel like world's worst mum.

Oh - and she is well fed, watered clean and dry!

My almost 20 month old still wakes at night. Its hard as its usually only once and it would only take me 5 min to re-settle her to go back to sleep, I still do the BIG No No and give her a bottle in the night.
I find I am going round in circles where I let her cry it out for the 3 nights, she then sleeps thru the night for maybe 2-3 nights then she starts waking again. I get sucked in and for some stupid reason start the bottle habit again. So the cycle starts. I know I am doing it all wrong and for me prob have to do the cry it out for a week before it will work consistantly.
prob will leave it for now as its not making me tired as its just 5 mins a night and will prob be going thru another battle soon when she has to go into a bed. Will save my strangth for that one I think!