When you drain the forks I'd reccomend you don't bounce them or pump them to drain out the oil... unless you have some form of catcher!
Two reasons... 1, the oil can squirt easily six feet sideways away from the bike, 2, Old fork oil is some of the most repulsive smelling liquid I have ever encountered (and I promise you the competition is fierce!)
Just don't ask how I know...
As to the oil, I fitted progressive fork springs from Hagon and filled with the grade of fork oil they recommended to the level they said, it made a huge improvement
Brakewize, if you are not doing it already I'd recommend a full strip and clean while the line is off and get the caliper 100%, that, along with fresh fluid and new pads will leave your front brake unrecogniseable!!
Good luck
Smudge