GSG, I understand what you are saying, but I think it is a matter of considering the risks.
For a non-LEO, when would you have to reholster quickly? If a perp is grabbing for your gun, why reholster and wrestle? Why not shoot him instead?
If you've just shot a perp, why reholster quickly? Perps often travel in pairs. I agree with what Randy Cain taught -- bring the gun to a compressed ready at your chest, be sure of your surroundings (Are you sure it is safe to reholster? Is the perp still a threat? Are there any other threats?), verify that you have the safety on and/or have decocked as appropriate for your gun, finger in the register position, then reholster.
In the case that you described, if the officer had taken just a bit more time to reholster with more care, then he might not have caught up with the perp quite so quickly. What is the better choice: holster quickly and take the chance of shooting yourself versus holster more deliberately and the perp gets away?
More than a few experienced students at shooting schools have gotten tired and distracted, reholstered quickly without thinking, and had their finger on the trigger.
I've got 200 hours of training at LFI, Sigarms, Cumberland Tactics, etc. I've competed in IDPA. I can draw reasonably quickly. I can reholster reasonably quickly as well.
But I accept the fact that even with all that training I can still make a mistake. So I still try to do everything I can to reduce the chances of my making a potentially fatal mistake. I try to remember to pause prior to reholstering and thus to focus on what I'm doing and where my trigger finger is.
OK, I typed a really in depth response here and it wouldn't post, then was lost to the internet forever.
I think situations are fluid, and can go from lethal to less lethal to calm and right back up to lethal in split seconds. I think it's important to be able to control drawing and re-holstering your weapon with one hand, because sometimes that's all you have. For a LEO, re-holstering can be the difference between life and death, as is evidenced in this post.
http://northeastshooters.com/vbulletin/showthread.php?t=36753
As soon as it's safe to do so, put your gun away quickly, efficiently and safely. I'm not saying shoot them and put it away before the shell hits the ground, but be able to get it done without fumbling.
Most of us here live in the Commiewealth, where an unfavorable police report can result in you becoming "unsuitable" and losing your LTC. This is something I factor into any situation. I don't put it before my safety, but I understand that while I might genuinely need to draw, getting the police or other people involved may not be in my best interests. Again, when it's safe, I'll get it out of sight.
I agree that taking some care when putting it away can save your life, which is why making safe handling habits instinctive is also very important.
So to sum up my answer to you, yes, civilians are in different circumstances than LEO's, but the guy who shot himself was a LEO (or a LEO-to-be).
Oh, and one more thing, you said to put on the safety before re-holstering...do you carry a 1911 or similar single action pistol, or do you do this on all your guns?