The R1 shock swap seems more appealing since I read above that a heavier rider than me was OK with the stock spring. Can I have the same ride height with the R1 shock?
From looking at the R1 shocks on Ebay, it looks like it uses a linkage on the R1. It's a little surprising it would work so well in this application, but it sounds like there are a lot of satisfied customers.
Didn't find anything about rear shock revalve from searching fork revalve (or from searching shock revalve), but there was a lot of stuff about making a better fork shim stack, etc. Both ends of the bike need fixing, so that's good too.
If I don't go to a suspension shop for fork tuning, I might start a different thread for that--the suggestions I've found here are all for heavier riders.