If the "main" leaks are true and considering the time frame, it should, the Switch would be in early stage of production.
So if you want a new version, wait 2, 3 years to have the NX-XL/Color whatever.
Not sure how you arrived at that conclusion from any of the leaks. There seems to be a
fundamental lack of understanding of what a dev kit is. It's a device that's suppose to accurately replicate (but early on, approximate) what developing on the final hardware should be like. As a result, depending on what version of the kit devs:
1. Don't necessarily have the same hardware as the final retail device. Just chips with similar performance
2. Have a bunch of extra debugging/development related hardware and software running on them
3. Usually are a tad bit more powerful than the device (at the least have more RAM) to compensate for #2
So essentially, while a dev kit showing that docking improving performance and that the device has a touch screen can be assumed as being the case on the real device, the battery life isn't necessarily indicative. Not to mention that while chips can't change late in the game, things like RAM, batteries, physic appearance tweaks, and anything that doesn't require actual long term engineering, can change fairly late. As long as they're before the manufacturing of retail devices starts