deapsquatter; don't be in too much of a hurry to upgrade the front. Ride it like that a little first. I think I've only bottomed mine (I weigh 92kg) out about once or twice over 14000km. It's nice and plush like it is now and works surprisingly well.
I love my upgraded shock (Wilbers from an XR650L - preload and rebound only). I found I left the rebound setting half way for quite a long time but I wasn't really happy with it like that because the compression damping was actually too much making the shock a bit harsh. I then set my rebound damping to the softest (most rebound) and this affects the compression damping characteristics too (making it softer) and now my bike feels spot on.
My sags are probably about the same as yours now, maybe a touch stiffer (I'll need to measure to be sure).
I'm sure you'll attest to the fact that this upgrade transforms the bike. It really feels like an overweight dirt bike now.