Just added JM! Gimme dem Swap Notes!
Nintendo generally announces a redesign a year and a half after the original comes out, so we're about due I'd say. There's no way it doesn't have two analog pads. I'd also put money down on having to wait another two years for the XL version.