For the catnap - this may help...
If she sleeps for 1h30m she can then stay up for 2h-2h15m-2h30m on that much sleep - she (will) tolerates this well. So, if her catnap is only 30mins - which is what it should be - she can't handle a whole full A time before bed because we just use this wee nap as a tiny booster to get us to bed. I'd say she could be up 1h30m/1h45m after the catnap - maybe more, maybe less - you will have to test it out lol - but that's easy to do. That means she should be in the crib at the end of that time - or she crosses into overtired land, and vacationing there isn't so great. If she can only handle 2h-2h15m of A time all day long, it wouldn't make sense that she could stand more then that at the end of the day, especially on a 30min nap. Make sense? So with A times increased it will be:
0700 Wake and eat - A time begins here
0850 Wind down
0900 Nap 1h30m - A time ends here = 2h
1030 wake - A time begins here
1100 Eat
1235 Wind down
1245 nap 1h45m - A time ends here = 2h15m
230 wake - A time begins here
300 Eat
440 Wind down
445 Catnap 30mins - A time ends here = 2h15m
515 wake - A time begins here
6/615 Eat, bath, top off, wind down
645/7pm Sleep - A time ends here = 1h30m/1h45m
Really try to limit her naps - especially the first one, I know it's hard to wake them - I wake my son at every AM nap- EVERYDAY lol. We need to strike a balance, waking her and spreading her day sleep out over the entire day nicely will help do this. I think sticking to times as best you can will be helpful to her, she needs you to teach her what to expect - if things happen at a different time each night - she won't know what to do and what to expect - does that make sense? If the clock is hard to watch, keep track of her A times in your head - regardless of what time anything was - have her in bed 1h30m/1h45m after the last wake up and that should be safe.
If she screams? Well my love - she is going to scream cause you are changing things, its her way of communicating. She would probably much rather you stay and put her to sleep then having to do it herself - but she needs to. I would not pick her up unless she is frantic. Not just crying - frantically crying. Put her on your shoulder while you are standing - no swaying or bouncing, just pat her back and shhh or hum, whatever. When she is calming down, put her back in the crib and pat/shh more in there. Other then that frantic part, I wouldn't pick her up at all. She will cry, but she will be ok - it isn't hurting, she is just tired, frustrated, stuff like this.
When she starts to mantra cry or seems to be settling, as if she is going off to sleep - this is when you want to try not to touch her - let her do this by herself. When she starts this settling, this is when you are going to slow your pat, and stop - see if she is still ok, and let go. Step back and listen, if she is going off ok - you can leave or you can duck out of site and be quiet if you want to, go back to her if she cries saying I need you. Help her as much as she needs, no more, no less - its her job to fall asleep, not your to make her.
I don't think you are making ANY mistakes, None. These babies don't come with directions LOL. Your next baby probably won't have any trouble sleeping at all LOL. Really, you and your baby are learning together what she needs - these aren't mistakes. You know what else? Eventually this is all going to click into place - and then you are going to be helping other mums with similar troubles and the prospect of a new baby - you will say BRING IT ON! LOL - you watch!
Ok, I'm off - I hope this helps some!
Love,
Zoey