One of the best rigid forks around has always been the Project ll as used to be fitted to the Kona range. They now do them in such a variety to fit all types of "Suspension" geometry and brake fittings that they will have a fork to fit any bike.

And a change to Aheadset system- if you do not currently have it- would be a good move.