Hi @Justin, welcome to the forum 
Sounds like a cool project!
In the absence of decent documentation for determining thrust factors, this thread (and others with the vehicle-design tag) may be of interest for some of the factors that should be considered.
Yes - you’re covering all the directions 
That said, there’ll understandably be some different control authorities (e.g. less pitch than yaw, more forward than vertical, etc), and there’ll likely be some coupling between some of those axes (particularly without accounting for asymmetric thrust).