Rob, what would be even better than a definitive list, is an editor that allows us to customise the numbers.

Not sure about your idea of switching to Naginata and ND. You will need some good firepower to counter any WM that might come your way.

Remember that if you flanking units lose out then your own flanks will be exposed!