Yea, I don't think I'd change much of anything else, and would emulate what you have. Depending on how much you value INT and Secondaries, maybe also look at things like Leggings of Calamity from Sunwell, that Ring from Hyjal rep with the proc, and Witching Hourglass from Blackrock Caverns.