M1
Go with the spring.I don't think there is much that can go wrong with a clip latch itself . To find the correct round nose style that matches in color would be difficult.I have worked on a lot of Garands and have never seen a bad clip latch except in the parts bins of some shady dealers at gun shows.