A few observations from the OP:
1. It doesn't look like you're accounting for critical hits. These actually do matter, as things that roll more dice do bigger crits, and this does affect DPR estimates. Notably, Advantage increases crit chance to ~10%, making it even more significant.
2. Damage...