On your first point, the plugs have improved quite a lot in the last 10 or so years. Still not enough compared to most other Western standards, and it's taken to long. But they have improved.

...Just in time for USB plugs and sockets to start taking off. Though I'm not sure how big a deal those are when it comes to safety.