Senior Upgrading Sticks

Getting back into golf after 25 years. Recently sampled drivers and ended up being fitted. Bought a 910D2 10.5 with Bessara A flex shaft. Looking at upgrading my ancient fairway woods. Should I be buying the same shaft for the /910F/3 wood or 910H/hybrid? Like my irons (Palmer Peerless)and hit them well and under control but have lost 15-20 yards of distance . Currently have True Temper Dynamic Gold R300 shafts on them. What other shaft options should I be looking for when I go for a fitting or changing shafts? George
I have the same shafts (actually the Bessara came out in 2012 and my first fairway has a stock Diamana Ihlana A-flex). Unless you plan on getting younger, your fitter might agree on a 4W 17 degree. The new A-flex graphite irons really launch well on the AP1. But I may be more senior. You might not get back enough distance with a new set of irons. Look at the gap between your irons and F/H clubs and see if a new fitted iron will be of value to you. ...Or if you try an AP1/AP2 you may decide to fall in love all over again. Just don't mention that part to Mrs. George.
Thanks Don for the reply and insight on the fairway wood and hybrid. I am getting younger but only in my mind. I'll see what a fitter has to say about new shafts for my current irons and go from there.