I'd go to an A2 stock & buffer system. Then throw some weight where the tool cleaning kit goes.