Who you think would win? There are those sadly (Like Nik87) think Zoro has a chance on Luffy, but you give good points on Zoro has all tools to be full power as we can't really it a base critic on him the same way Luffy is. Ignorance like people like that is sadly plaguing this debate here.
The main difference between the toolset of Luffy and Zoro is that Luffy powers up whereas Zoro has a more constant pool of stats and techniques to draw from. They're simply different sort of fighters.
Zoro is capable of casting heavyweight techniques with three swords. Luffy cannot defend against those sorts of techniques without accessing at least Gear Third. Luffy is fast, strong and durable, but only because he can freely use his haki and gears to defend. It's not like he fought any big battles without using either one of those.
I don't think Luffy in base form can deal with what is essentially at least Gear Third attack power. Thematically, I think it makes sense too. Nevermind the hierarchy - Zoro has three swords, Luffy has four gears. It's specifically Gear Fourth which allows him to go toe to toe with top class bounties. Zoro's three swords therefore I think are reliably beaten in Gear Fourth (and Zoro's three swords reliably beat Sanji's two legs :^).
tl;dr - full power Zoro won't lose to base Luffy