Interesting, I am still not sure if penalizing deaths is really needed, since in order to have many kills you already need to die few times (respawn time, etc.) and more deaths also mean less killing sprees and less xp for battle sense. The fact that you have more data if compared to the past doesn't mean that you necessarily need to use them all if the formula is not an improvement, anyway if you give too much negative points for deaths, average players (same K and D), will end up getting 0 points.

If we assume 1hs = 2 bodyshots, and we ignore the difference in damage between weapons (which is assuming a lot of things ), hits + hs would be proportional to damage given, I don't have enough data to guess the average (hits+hs) needed per kill, should be around 10 in adrenaline servers.
So making (hits+hs) / 10 should be of the same order of magnitude as kills, what about:

points = ((hits + hs) / 10 + kills) * 2.5

and ignore deaths, or maybe give just a -1 for light weapon deaths? This way it would have the benefits of both worlds (high damage, that is no kill stealing and many frags, that is being able to 'finish the job')

What worries me when you take damage into account is the difference between adrenaline on/off servers, because you need to deal more damage with adre on.