Remember to be careful when upgrading the fork because some frames are spec'd for a certain maximum travel. For instance, I have a XC frame which shouldn't have a fork with more than 100mms of travel. I guess the aluminum can fatigue with the excess travel.
Ricardo