Once again, no matter how much you piss with damping if you have the wrong springs, on both ends, you're wasting your time.
The springs carry the load. The damping controls the movement. You CANNOT fix one by adjusting the other.
Also, fixing just the forks and leaving the shock too soft is, once again, pissing in the wind. Both ends of the bike have to work properly or you'll just be chasing your tail.
Put correct springs in both ends and ride it. THEN you can decide if the damping needs work. Throwing random parts at it is just wasting your money.