Laura, As long as you are persistent, things will work out. We found moving DS to his own room worked wonders, he slept better and we slept sooo much better too.
Emma Louise, that is fantastic news. Keep it up, and she will soon be weaned from the middle of the night feed. With regards to 22/24 oz of milk a day plus 3 meals, I would say that is perfectly fine. Once your lo is fully weaned onto solid foods, they say that the minimum intake should be around 20 oz, but can include milk in cooking as well as other dairy products, so would say that your lo is doing perfectly fine. You want to make sure she fills up on her milk first before her solids, as this is where her main source of nutrician comes from.
Keep us posted ladies.