@spslizer sorry I wasn’t clearer before: the switches that are on the primary/secondary buttons are the OMRON D2FC-F-K and the primary switch has failed. I’m replacing them both with Kailh GM 8.0 switches since they seemed to have a good reputation.
I definitely need to study desoldering more though, I am having a lot of trouble removing the bad switches!!
We used this guide to clean the brushbar assembly of the DC41 animal too. Thank you SO MUCH for writing it!!! We’d never have tried pulling the bar off sideways.