Was it a job to change the oil in the original shocks? I might try that with the rest of the things and get the Ohlins in the near future.
Here is the thread showing how simple (pics. included) it is to change / experiment with the oil in the rear shocks. Read the entire thread and you can see that some members used various viscosity oils, and as a result needed zero air in the shocks to out preform the OEM set up.
This is a less expensive alternative. For an hours worth of your time and $5.00 worth of fork oil you may be pleasantly surprised at the outcome.