sounds like you have it all covered, just remember to copper ease the f**k out of the threaded shock body to avoid the lock rings seizing. and before you loosen off the camber bolts / shock bolts to hub, score where the shock meets the hub with a screw driver / Stanley knife / mark with tippex pen so you know where to put the new shock so the camber of your wheel isn't out. and get your tracking / camber angles checked after