These can be tricky to diagnose with out actually hearing the noise, but from what you mention i feel that it may be over head gear and engine oil pressure, i feel it is time to talk to your local mechanic and let them have a listen to this one.

Check the Alternator belt Tensioner for excessive rattle at idle... have someone rev the engine while you look at the tensioner.

If the tensioner roller moves LESS above idle speeds, then you have a one-way-clutch failure of the alternator.

If you can get to the alternator, you can check the clutch while it is still in the car: (this clip also shows the tensioner vibration / rattle)

http://www.youtube.com/watch?v=c_SDQiTT2sg

Here is what a good clutch / fan tests like in the car (engine off):

http://www.youtube.com/watch?v=hrgKsQXDdo8

This is how to remove the clutch pulley: (Golf TDi as sample).

http://www.youtube.com/watch?v=L3s0IVhLVto

Thomas