I don't think it is too early all and think you maybe staying too long. I would put her in the crib and leave. If she cries - hold back a bit (not CIO) and see what she does. If it is just a moan or forced cry - hold back more. But if it gets to the very upset cry go back in and do PD (at this only PU if really, really needed. If you need to calm her, then i would put the rail down and you kneel to her level but don't pick up)
Here is what do for pd: I put her down, if she gets up I do this a few times - once she stays down and is calm, I pat for a minute and say nap time honey, good night, then leave. If she won't stay down after a few tries, I put down one last time and say nap time, good night and leave. If she is upset (not just moaning or forcing it, but the very upset cry) I wait 1 min, go back in and repeat.
She may surprise you and w/in a few days doesn't need you come back at all.