Epson P600 Cover Switches Are Kind of a Kludge

The little switches that came with my kit, that trick the lid closures seem like they were designed for another printer. They sort of work, the main lid switch barely stays in place and vibrates out pretty regularly. If you look at the lids and note the shape that switches the lid sensors off, they are pretty different than the supplied switches.

Has anyone rigged a better, home grown solution? I suppose some tape will hold the main lid cover switch in place. The cartridge cover switch seems to stay in place but is still a bit of a clumsy shape, and its small enough that my fat fingers have actually dropped one, probably never to be retrieved, between the cartridge recess and the front panel. Fortunately I haven’t seen any ill effects.

Anyway if anyone has a better solution I’d be curious what you did. Thanks.