I agree with you, Vidota!
Klaus does seem to be fully interested in the baby and not Hayley... but there's always the possibility, and from what I gathered, the writers are leaving that door open just in case they want to add a triangle, and that's the part that makes me a bit weary.