First of all, i think it's good to look at your shaft before anything els,
its the shaft that makes the club work.
reading your info, i think you will benefit an X stiff shaft, but on the other hand,
if the shaft is to firm you will lose the balls even more to the right. you should
be looking at a high or mid kickpoint on your shaft. and a heavier shaft might do
the trick also.
For what i read you are not get fit properly, your spin rate is to high, other shafts should
get that lower.
As for me, i used to have a verry high ball flight myself, ( had a cobra S91 F 10.5 deg. with pro launch blue stiff shaft)
I went to a new club because my loft was to high, i bought this club during a period of not
playing as often, my swingspeed at that moment was about 90 m/ph so at that time it worked,
now with me playing 2-3 times a week me tempo went up to little over 100 m/ph so i did need to change shaft also
I now have the Taylormade R11 driver with aldila rip stiff shaft, what is nice about this club is that you can ajust the setting.
Like face angle and loft. This could benefit you also, maybe you could go to the local golfshop and have a go with it.
maybe this club can get you out of your fade also. This club comes in a 9 degree loft, but you can lower that 1,5 degree.
as for me i was hitting hard draws and i changed the face angle to an open setting i now hit soft draw with carry about 250 and
i get 20 yrd roll, my ballflight looks so much better now.
So in my opinion shaft is the key but a new clubface could benefit more.
Good luck