Great idea with the cotter pins but I would remove the lock washers and replace them with flat washers. You can grind them to fit. Grinding the lock washers compromised their integrity. If they crack and most likely will, they’ll fall out and now your mount will be loose.
