BTDT too. Just drill out the rivets and when finished put in small screws and nuts. Worked for me and like you felt good to fix it.
Years ago I was stationed in England and I had a friend with a Morris Minor. He said that the switches in the car were like that....you just disassembled them, made the repair and reassembled. Sounds like a plan. But today it's buy cheap and throw away.....I know the solenoid you mentioned isn't cheap but the philosophy is the same.