I did that like 4 years ago, but from what I remember you are on good track.

 

That bottom bolt that holds the shock in place that is next to the fan housing is a pain in the @$$ to get to. I had to get my wife to get that bolt out. No kidding. She doesnt mind getting her hands dirty. When ever there is a tight area like that I always call on her for help. My hands are to big. The spring is easy, you just take a ratchet extension and put in the hole, apply pressure to finish backing the bolt out that holds the spring.
Putting the bolt back in that holds the small shock tensioner is also just as tough as getting it out. We managed to get it done with out taking the fan out. All is good!