Even "nerfed" I'm pretty sure everyone will want the amp trinket. 14% passive buff to haste, mastery, and crit multiplier is just too much of a scaling buff. That is while it keeps static int and the proc. Amp for pvp was never going to work... A bis lock might have 15K of haste and another 10K of mastery or vice versa. That is going to be a passive 3500'ish secondary stat points, plus the ~2K static int, plus the proc (in pve). That is with a ilvl in the high 540's to low 550's. With heroic gear we are talking what 575'ish ilvl before upgrades? Let me know if I'm majorly misunderstanding something here...its late and I've not had coffee.
I actually think the slower stacking on the haste/int trinket will not be so bad for aff since it makes for higher overall uptime. Faster stacking = faster expiration or again I might be off my rocker on this...just a thought.