Kaitlyn went through this stage as well and spent many a night in our bed from about 2am when she would wake screaming . Thankfully (touch wood) she has passed that and is back in her cot now . Everytime she has become unsettled though it does seem to be due to teeth .

I am sorry I have no real suggestions except go with what you feel is right for the two of you as it will pass I am sure.