Buy a corrected one from Mato! I know you dislike them but they've got em! Maybe you can get one from Blueslateman or Pugwash on the auction site. Cheap shipping from UK to USA with those fellows and they usually have the barrel extension too.