I forgot to mention in my last post that for SB #17, we did not have to change the rivets as they were the correct stainless steel rivets.  I lucked out and have a properly made elevator stop.