Nala had about 8 teeth pulled at the time of her spay. The vet only had to nudge a couple out and the others were pretty solidly stuck in there apparently. I would def do it at the time of the spay-- our vet suggested waiting until 7 months just so we could see how the tooth issue would play out.
Good luck