Make sure you get the weight in the right place!
I used to have a Cleveland HiBoreXL that was shafted with an Oban Devotion 8 (~85g) shaft and came in at E2 swing weight. Still love that club/shaft combo but have needed more loft. Buddy bought it from me but I doubt he will sell it back to me if I can get down to needing the 10.5 loft as he also hits it really well.
I should have kept the shaft, those are still really expensive on Ebay and are really stable.
I currently have the Nike Covert 2.0 set to 12.5 and have an Aldila NVS 85-S shaft that comes in at D5 swing weight, that I would like to be a little heavier, but have not gone to lead tape, even though I should.