So am I cursed to installing an image to a new machine, installing drivers and then re-imaging and uploading to the WDS server every time we get machines with new hardware? Or is there an easier way?

Windows Deployment Services in R2 now includes what MS call Dynamic Driver Provisioning - the Vista SP1+ install can now pull down drivers from the WDS server when it does its PnP detection.