Aye. If you use egg yolks only the sauce binds up immediately. The starch in the water seems to prevent it from going runny and instead makes it quite silky.
Always use the yolks only. Run the risk of ending up scrambled eggy whites otherwise.
Bit of a b*****dised version, but try chorizo and manchego. Surprisingly good alternative.