Did I?
What I'm doing is taking the base damage of a shot, and multiplying it by
[(Crit%*CritMod) + (hit%-crit%)]
So that distributes to (with X representing base damage)
(Crit%*CritMod*X) + (hit%-crit%)*X
or with 100% chance to hit
(Crit%*CritMod*X) + (1-crit%)*X
Is that not correct? I wana say that's how Cheeky does it in his spreadsheet (and I think he verified that part for me), but I could be wrong too :P