You seem to have put a significant amount of effort into the edits regarding the weapon damage calculations so I didn't want to just reject them without comment.
The way you've changed the DPS calculation is a fairly common misconception but can be demonstrated as incorrect naively.
Take the example on the weapons page.
For round numbers, say that 200 attacks are performed. They do the head attack 75% of the time. That means on average, they did the head attack 75*2 = 150 times. Dealing 31*150=4650 damage, and taking 2.2*150=330 seconds.
And on average they did the arm attack 12.5*2 = 25 times, dealing 14*25=350 damage and taking 2*25=50 seconds.
And on average they did the handle attack 12.5*2 = 25 times, dealing 15*25=375 damage and taking 1.6*25=40 seconds.
So they did 4650+350+375 = 5375 damage, and took 330+50+40 = 420 seconds to do it.
5375/420 = 12.797 DPS. I.e. the same as the 12.8 in the worked example after rounding.