I had a similar issue, and just like you said, I ended up replacing the parking brake switch as well. But in the end, the real problem was just a single corroded wire going into the connector on the right side of the EPB module.