Salvaging my gear

[Vectivis]

Hello, first expansion playing mage, I started off with Arcane, so I geared Crit/Mastery, but hated the low dps done during downtime when not bursting, so I switched over to frost. Because I had crit mastery gear, I went with Glacial spike build, i'm able to do between 500k and 600k to a heroic raid boss with 900 ish ilv gear. My question is would it be better for me to just continue with arcane, which struggles to keep up the 500k dropping to 450k when not bursting, continue with glacial spike build until ToS comes out and try regear crit/mastery, OR just re gear completely to crit/haste before ToS drops, and suffer 400k dps with Thermal whilst doing it?

https://www.warcraftlogs.com/reports/am ... amage-done" target="_blank

My current stats are
Crit: 26.8%
Haste: 19.65
Mastery: 60.85%
Vers: 3.6%

I know I need to try get crit to 30% at least, i'm working on that.

Cheers