You're such a good kitty mama! Sounds like you've done a lot of helpful research and she's coming along nicely. It takes time for kitties to adjust to their regimens, I'm sure.
The annoying advice bit: make sure you keep the vet advised of what you're doing so that s/he has all the information necessary in case something happens and Willow needs to go in :)