Technically the handgun Leon uses becomes a SBR with all its upgrades. Short barrel rifle to be technical. I don't think they want a handgun that always has focus shots. It would be nice though. Not sure if it should be allowed.

I just run the first 10 minutes from new game. That way its random and I am still trying to get a 9.00 to the safe room. Best is only a 9.37 atm