Actually I am saying both. He has so much skill with wooden jutsu that he can make a jutsu for a structure.
Yeah, Naruto's fighting style seems to show mastery, but he needs to learn more skills to master. He has what? Two? Sasuke has Fire, master of weaponry, mastery of movement, and mastery of sight. Sakura has chakra control, medical technique, genjutsu, and stamina (for girls anyway). Naruto does not even use his summoning jutsu. -_-