Yes, that lock should work. Maybe tackle the barrel first, as time and budget permit. What's good is that your lock, stock, and barrel are all here in the States. So, any required work beyond your expertise can be done locally, with shipping within the USA. Even your stock blank can have the...