Jason I am glad that your suspension is ok. As regards your whining have you listened for the noise when the ignition is turned on. As mentioned in an above post my whining disappears after about 5 seconds when only the ignition is on. Start the engine and it is there all the time.
My local garage who had recently serviced the car also could not hear the noise, but when they checked it the engine was running, because at the time I did not realise it could also be heard in ignition on mode as well. I feel sure it must be the diesel pump, my only concern is whether this is normal, or is another hefty bill around the corner.
Regards.....