I would put Ronaldo above Messi purely because he's demonstrated elite status in a variety of scenarios compared to Messi who spent most of his career at a team

I would put Ronaldo above Messi purely because he's demonstrated elite status in a variety of scenarios compared to Messi who spent most of his career at a team that was built around feeding him (and once he left, he has not performed anywhere near as well.)