The Bersa Thunder 380 was THE pistol I was considering before I got on the compact 9mm kick, still have it in mind for the wife! If you have any doubts about that pistol go check out nutnfancy's review, you'll be running to the gun store! Sorry you had issues Charlie, wish I knew more about smithing to be able to give you some advice, but I would definitely be in touch with Bersa, they may have a solution for you! Not sure you didn't void your warranty, but it's worth a call.