@dev I would add a third option, a bit more intense but a "better" fix.3) Label what each wire goes to, remove the 3 gang box, push the wires in, patc...