You're on the right track either way :D
And honestly, with the S2 gavel available, the Cudgel of Consecration sitting in a nice lawlcakes easy heroic, and the Amani Punisher early in ZA -- you aren't stuck with the Blue ~120 Spell Damage weapons for very long before you get a ~200 one.
For what it's worth, I'd second the Contiuum Blade out of the options that you give, Stamina and all.