I would go see Steve and Lisa at Precision Arms & Gunsmithing in King City (Phone# 905-833-7151). They are located on the North East corner of King Road and Jane Street (Just East of the 400).

Steve has done some quality work for me in the past and has been very honest. Give him a call or take a drive upto King City.