Hi Joe,
If it is still under warranty, and the switch has a broken part, get it to the dealer and have it replaced for free.
Glue on plastic, including epoxies hardly ever create as strong a bond as the original material. And if you don't disturb it too much, it is still under warranty. I would put it back in, go to the dealer and see what they find and replace.
It is a good way to see how honest your dealer is as well.
V/r
SM