Ordered a new fork today!
After many suggestions, that Marzocchi is the way to go, I ordered one today. I ordered a 2004 MX Comp with a Cane Creek S2 headset. Unfortunately the fork is on back order, but I'm really looking forward to it. I also ordered tools I'd need so that I can install myself. I'll update you all when I get it on and ride it.