More Sauce, Please!

We are trying to night-wean N. This has been going on for over a month, more or less. Back in September we weaned him off of falling asleep while nursing. That was a huge hurdle, and he cleared that in a few days time. The first night was absolutely brutal. Beyond brutal. He wailed and wailed while we did everything to try to comfort him, including walking outside with him. Then in late October we worked on night-weaning him. After a hellish week, we managed to get him to sleep for about 7 hours straight without waking to nurse. This was a dramatic improvement from his usual routine of waking 3 to 4 times a night to nurse. Now he's developed a new routine. He wakes around 3-3:30 am and is fairly satisfied just to hold onto my nipple. Unfortuantely, this really doesn't allow me to sleep at all. He also sleeps pretty restlessly. Then around 5 am, he is pretty adament that he be allowed to nurse. Sometimes he tries to just get down to business before then, but I manage to fight him off. Well, after 19+ months of nursing him, and over 2 years of not having a solid night's sleep, my sauce is pretty watery. So our plan is to move N into his own room at the end of the year. I just need to hang on for a few more weeks, I think. I have very mixed emotions about moving him out of our room. I want the sleep, but I will miss nursing him in bed while he is all sleepy and will miss cuddling with him while we sleep.