I came here to see about my engine bay whine and mine started out from a scenario very similar to yours.
Within the past 20K water pump and all associated parts in the path were replaced, and alternator was rebuilt. So I doubt it was those..
If you or anyone else figured out what it was, I...
