Here is a simplistic answer but it works for me. If it gets a squiggly underline in Word until I add the hyphen, then I add the hyphen. Also, if it is two words in MasterFormat title, e.g. Wall Coverings, Curtain Walls, then I give it two words.
Sounds like a good plan. (Let someone else make the decision - grin)