Things have been fantastic! She hasn't asked for a bottle at all (I posted that I sold them after a week of dropping them cold turkey so she would be outta luck if she asked anyways
).
Bedtime and naps are completely fine now.. the new routine has worked out well! For naps, we read one story have a quick snuggle and she goes down with a bit of chit chat.. bedtime is snack, bath, stories (2), a bit of water and a few mins of nice snuggles, then into bed. Asleep fairly quickly.