Luiz Ronaldo was great for both club and country.

Henry was great for club, played out of position for country.

Nistelrooy was great for club only.

Same for Eto'o.

Edinson Cavani's chances is too limited at national level.

Therefore I would say that the person who came closest to Luiz Ronaldo and fits the bill you have described is David Villa, even though Messi is scoring twice as much as him. Next would be Mario Gomez.