My dad had the opposite issue, where the light would stay on. He took it to a shop and their solution was to put a return spring on the pedal (unbeknownst to me). After I got the car I happened to be looking under the dash and saw the return spring and thought what the heck. I removed it and later my daughter asked why the brake lights were on. Like you, 5 minutes under the dash, and the switch was adjusted. No more problem!
