Personally, I would consider removing hub integration. And just having headless with a regular notification like before.
While hub integration is really cool, if it's causing so many issues, maybe washing your hands of the whole thing is better.
Welcome... to the world of TOMORROW!