I'll have to give the car a good once over when I've got time. I still can't figure out the lumpy idle, but it's not affecting the driveability of the car. Ah well, I've accepted it as one of the quirks that the car has.
Thanks, everybody. I'll let you guys know what it turns out to be.