Install valve emulators in the current fork. They work really well and spare you a massive amount of hassle if you want to keep things the same on the outside. (Head bearings, brake, clamps, wiring, headlight, fasteners etc. etc.)
I have YSS brand valves in my 35mm fork, but Racetech is probably where it's at. Since they didn't answer my emails and I live in time zone that makes calling inconvenient, I went with the company who'd communicate with me. Easy to install with some minor drilling needed in the pumping rod and a few coils cut off the stock spring and ground flat again (unless you want more pre-load, in which case you don't need to cut the spring). YSS will provide a spacer if your pumping rod is flat on top rather than cupped.
By all accounts Racetech is great people and a superb product. You could even just send them your fork for a total workover, I think; springs, valve emulators, and all.