MrsN if it hasn't already been suggested to you, I would recommend reading "What mothers do" by Naomi Stadlen - I just started reading it after it being suggested to me on MN ages ago, and I have to say, it is a comforting read (although I was crying a little on the train as I read it). For anyone who has felt a bit shit about being a mum...
I think your plan to go back to what was working before sounds like a very good idea - maybe try again in a month or two, or when you want to try again. Seperation anxiety sounds a real possibility, or maybe going through a developmental leap and feeling unsettled? It is all about coping 
On the Babytea front, we are still not making any progress really - he is settling fairly quickly when he wakes, but he is still waking several times a night. I made DH do night duty last night though (as I am now not feeding DS before 5am unless absolutely necessary) and I felt much better for not having to get out of bed all night even though my sleep was still disturbed. It also showed DH how bloody knackering it is to be the one getting up all night!
Went for my first outing with my mum and dad this afternoon since my dad was diagnosed - his wheelchair is a bit unwieldy but it was lovely to be out with them again 