When Legend happens I would be thinking driver and 3W - certainly driver.
.....................Irons probably still easily OK, but not cream.
Your credits and your fun but one look at the L Tier RGs shows what you really need at L to compete. Your irons and Callys doing OK last I looked (been a while since looked so please check that one)
easily If it were me I would consider a new driver, 3W and L90 irons teamed with a L81 ball as Rolls Royce ample upgrades........I am not sure the L90 ball with L85s balls is really going to accomplish much v cost.........
Mapping as described is the real key for now and a good while, IMHO.