Sounds like you're doing great! Well done especially on that first nap and with moving towards independent sleep!
I have a few thoughts for you...
I think your second A time may be a touch too long and she may be waking early from being OT. Can you try putting her to sleep about a half hour earlier and see what that does to your nap? It could be that she's a bit overtired and that's causing her to wake earlier and not be able to fall back to sleep. I think you're really close to where you need to be, so I wouldn't move it earlier by much, you might even start with 15 minutes or so.
How sound a sleeper is your son? Do you think if you just shhhhhed her from your bed she would settle back down at night? I know that with my youngest (who was a pretty awful sleeper), I would often shhhh while he was in his crib and it would settle him back down -- or a shhh and some patting along with it? Or do you think that would disturb your son? It's a difficult balancing act you've got going, so I feel like you have to do whatever is going to work best for all the members of your family.
I'm also somewhat torn on your BFing timing -- clearly, she doesn't need to eat as often as she is so I'm wondering if feeding her before and after naps is causing her to want to be fed more often....on the other hand, having the nursing before naps really helps some babies sleep. If I were you, I'd probably leave it for now, but keep in mind that it may be something you might eventually want to eliminate -- or even eliminate the nursing session after the nap and just focus on her taking a big feed before. Again, it doesn't seem to me like that's causing a problem right now, so I'd probably leave it.
I think you're doing great!