He was more than both, which is why he is known as a polymath; he has many skills in many different areas. An inventor, an artist, a scientist, a mathematician, historian, astronomer and so many other things
That's why I think he is the greatest genius, he was so talented in not just one area, but many which could inspire people to not limit themselves.