M.L.
We just did this a few weeks ago. Unfortunately, now the whole family is battling ringworm now, so make certain the kitten is free of it!
Anyways, it sounds like you are doing good so far. We had crated our dog or had her in the bedroom the first two days, so the kitten didn't feel threatened. Then, we slowly exposed the kitten and dog to each other for short periods of time.
Of course, your puppy is more playful and will likely annoy the cat for a while, our dog is older and not jumping up on the cat. It will take some time, but they will get used to each other. Just trim the kitten's nails so she can't scratch. Our dog and kitten will even eat from the same bowl, though they are not playing with each other much.
I grew up with a dog and 3 cats and they played together, napped together, ate together. One of those cats hated my dog the first month, but they became best of friends.