If it was fitted then I would stick with what you were fitted for unless you feel you didn't get a "proper" fitting.
The Smoke is an excellent shaft.
Try some things first like tee-ing it up higher when into the wind and concentrate on a smooth swing. However going by your set up you are an accomplished player who will know these things so I won't try and teach you to suck eggs.
Shafts can mess with your head, if you seriously don't like the Smoke but love the head I'd be going to see SG they'll get you the flight/trajectory you wish.
