Though, I'm considering just giving the first round a pass and making a decision on the next iteration of Surface (if one does exist). A little unsure of buying something first gen when it's possible that the second gen will be vastly superior (esp. in terms of fixing any nasty issues).

That's my plan, too.  It sounds like Intel has made some great progress lately in super low-power x86 chips recently so by the end of 2013 I'd expect to see a second-generation Surface Pro that uses a lot less power.  Plus the Windows App Store will be a lot more filled out by then.