Personally, Lost in Hazzard, I agree with you. The reaction and then nailing the golf shot really don't correspond to Avellino's having prior knowledge of Sayid. It is more as you describe: Crap, I'm involved with these people or these events in some way, and this is a weird coincidence that I'm meeting up with this guy. Something weird is going on and I cannot explain it.

I really thought that the 31 minute thing that J. Wood mentioned was pretty interesting though. However, like you, I'm not convinced that the golf scene came after the Ben & Sayid covert ops reveal scene.