Charlie has posted what I had been thinking about.  I thought I had included that link, put a computer issue messed with my comment.   I duplicated the store bought parts on my own.  As you have found, the wave washers are prone to breaking, eventually so are the spring clips.