I was doing #1 but simcraft is telling me to use a different mix of the gear I have which has resulted in #2, it seems to sim higher in DPS anyway.
SimC is currently giving me: Str > Vers ~= Crit > Haste > Mastery
Comically, if I change player skill from "Good" to "Elite" then Mastery overtakes Haste and I gain 36,000 DPS, but I have no delusions about being a cyborg lol.