Hi and welcome to the BW Boards.
With regards to starting your new routine, it can take up to a week or so before things fall into place. From what I can see you are doing everything right, it may just take a little while for you lo to get settled into her new routine.
I see that you are doing roughtly 2.25 hours of A time in the morning and it took your lo 20 minutes to settle. Do you think it may be worth trying a 2.5 hour A time and see if she settles any quicker after that.
It might also be worth extending your cat nap and starting it at around 5pm after a quick feed, and then wake her up after 45 minutes. This will just give her enough energy to get through the evening until bed time. You can then offer another clusterfeed at 7:00pm
I would definitely persever with the PU/PD, again this can take a while to start working, but perseverance is the key.
Have you tried offering a DF at around 10:00pm - this can be given to your lo whilst asleep, and helps them tank up through to morning. The DF is usually weaned at around 7 months once your lo is fully established on 3 meals a day, but it may help your lo tank up a bit more.
HTH's
Paula