I had considered endodontist to be a subset of oral surgeon, and indeed I would consider my one endodontist experience—repairing a badly done root canal—to have been oral surgery, what with the cutting of my gums and going in above the root and stuff, but it does seem like you are correct that “oral surgeon” is a different category.