Here's a great article on retained baby teeth.
http://www.lowchensaustralia.com/health/teeth.htm
I might hold off for a short while so you could do both at once because i don't believe that they will eventually fall out and leaving them too long causes damage so you might be looking at putting her under twice in a very short time; however, you might run into a first heat too.
i just got a 3 year old rescue that still has baby teeth. just letting her settle in and then i am going to take her in for baby teeth extractions (probably some adult teeth too by the looks of it) and cleaning.