Neither in my opinion, I think Maradona was, especially when you consider how little protection he got from refs in comparison to modern players.

Messi for me though, no question, is the best of his generation and top three of all time.