That's the one. And I'm not fussy one way or another about the keycaps - I loved the old ones, but I can see the arguments for the "island" style as well - it's the switches underneath that were the thing.
Same! I like both but I have a slight preference for the flat ones given the small distance between the keys that make it easier to do many things - including repositioning my fingers (F and J have a nub, but the spaces between the keys make repositioning easier, especially with nails)