I ran the commands you mentioned in this comment and it seems to be working for the time being. I found that the issue took a few hours to occur - perhaps enough time for my phone or laptop to want to hunt for a different band - so I will update if that did not fix the 6Ghz issue
In the meantime I look forward to a possible firmware patch to fix this