That's how I read it, too - and also a way for them to blow up the gay panic of earlier movies and ESPECIALLY the novels. The Bond in the books would have TOTALLY flipped out the moment Silva touched him. In some ways, to me, the scene was an acknowledgement that Bond can be macho without panicking over Teh Gayz.