I can't help with the hub connectors. I use the SP/Shimano connectors.
I think all the B&M lights use the same 2.8mm spade connectors, you probably just need to squeeze them a hair tighter to stay on. When mine have fallen off, I just squeezed them a hair tighter with a pliers.