[@CollectorOfMyst]
Mostly curious btw, but are you taking the most recent errata to account? I believe it contains the Beast Master update as well as allowing spears to work with Polearm Master, which is a personal favorite change of mine.

https://dnd.wizards.com/articles/sage-advice/errata-november-2018