Naruto definitely. He's made all of his progress through the use of his clones. Madara was pretty cool with clones too, but Naruto single handedly saved the shinobi alliance and the war with his. And 100 RSM clones beat 4 limbo clones
Definitely Naruto.
Madara just used them for brute force.
Naruto actually used them to deceive, outnumber, and overpower. He not only makes clones but he also transformed them into objects like Sasuke's windmill shuriken when they were fighting Zabuza, a Rasenshuriken feint when he was fighting Pain, reverse harem Jutsu against Kaguya etc.
In terms of raw power, Madara takes this.
In terms of creativity, Naruto takes this.