Just an update. Picked up my car yesterday afternoon and they said the switch they replaced before (don't know which one it was) was bad from the factory and they had to replace it, again.
Working fine today, last time they fixed it I made it 3 days without it messing up again. Here's hoping it's actually done!
Thanks everyone for your input.