As for the "computer" labeling, they've been doing that for their N-series for some time (either they don't like the usual smartphone moniker, or just trying to one-up the competition in naming), so I don't think that's an indication that S60 is taking over Maemo's role.

As for the rest... I'm substantially in agreement, but maybe I just haven't been around long enough to be properly pessimistic; I do see Nokia as improving with regards to open-source. (Now when the best you can say is "improving", it's a sign that they'd better be improving. But I think they are headed in the right direction regarding open-source, for now.)