Said this a thousand times...
The most cost-effective, simple way to get the front to match the upgraded rear are straight-rate springs, 15-20wt oil and gold valves.
Barring a full on swap, this is as simple and straightforward as it gets. I've been down the same road that all of you have with the shit damper rod front end and nothing you can do to it will make it work better than it does with the gold valves. You don't even need to pull the uppers to do the swap.