I was fitted at the Oceanside, California location in Spring 2016. I bought the 915 Fd 3-wood, AP2 irons, and the SM6 wedges that were recommended during my fitting. I did not buy the driver or hybrid. 3+ years later, I would like to buy the "updated version" of the hybrid I was fitted for. Here were the hybrid specs in 2016:

816 H2 hybrid RH 19 degree loft A-1 setting -0.5" length Fujikura Motore Spder Tour Spec HB 8.8 X-Stiff flex

My fitter also put in the comments for alternative shafts "Rogue Black 85H X, Diamana Blue 80X"

What is the 2019 equivalent to this fitting? I would think it's the TS3 hybrid, but I'm trying to figure out the shaft.

I carry my 15 degree 915 Fd 3-Wood about 240 and my 2016 AP2 4-iron about 200, so I'm looking for a 215-225 club.

Thanks in advance!