I think you got them the wrong way round, but yea, else you are correct.
I personally hit haste to 2nd breakpoint then balls out mastery. Crit is an RNG stat, always will be. Doesn't matter if you have 99% crit, there's still 1% chance that you're going to not crit on each spell. I prefer mastery as it's a working stat which is more reliable. Following this, the 4 set is worth picking up for the hell of it.
If you wana stack crit, go ahead, it's theoretically sound. It's personal preference at the end of the day and if it works for you, then why change it