It sounds your new routine (1 x sleep) may work...
GL too with the night weaning...i found i just offered it less around 12mth mark (but i was pregnant too), and gradually they lost interest.
Im sure you will never forget the 2hrly wake ups....maybe return the favour when she's a teenager.....vacumn at 8am or something LOL....GL hon....

