Sounds like you have a conscientious vet
I wouldn't spay a yorkie before 6 months of age and agree with your vet that its better to wait so if puppy teeth need to be pulled, it can be done at the time of the spay. ZoE was spayed a week before she was 7 months old.