I would personally just have them removed while he's under.

While some of his baby teeth may come out on their own
eventually, it's highly likely that he's gonna have one or two
retained. You definitely need to get them pulled while he's
under anesthesia so you might as well do it during the neuter
and do it all at once.