“The original minhag only encompassed marriage and hair(beard)cuts.”
Correct. And erusin was even permitted. See Shulchan Aruch 493:1-2. There is no mention of avoiding music. I have been advised by my rav just to follow the halachah that is in the Shulchan Aruch and Rema here.