That's the plan! Unfortunately, the 2" Roxul comfortboard is not available in Canada unless you are willing to buy a pallet worth so I will be making up some DIY panels with 1.5".
I made up some DIY bass traps but I don't think they made any difference at all. Need to some subjective comparisons as they made no difference from a measurement perspective. I'd hate to ditch them as there is about $40 worth of material in them but doing so will free up more space on the WAF scale for wall panels.