This discussion was, in fact, making the rounds of the standardistas a week or two ago (following the release of html5test). Not only did everybody agree with your assessment, but most of them thought it was good (only a few people such as Tantek are trying to make HTML5 refer only to the W3C HTML5 spec... they'll fail).
As Chris Wilson insightfully put it:
> HTML5 is now a brand, more than it is a specification. There are a variety of reasons for that, and a variety of persons “responsible” for that confusion, but the ship has sailed.
See also:
http://www.zeldman.com/2010/08/01/html5-test/
http://jeffcroft.com/blog/2010/aug/02/term-html5/
http://blog.codinginparadise.org/2010/06/why-im-going-to-kee...
AJAX originally meant (as its name implies) the use of XMLHttpRequest to asynchronously load xml data from a server. However, it quickly became a buzz word that meant increased interactively on a web page outside of the page reload. HTML5 has similarly evolved from describing a limited set of new standards to describe a new way of building highly interactive, desktop-like web applications and encompasses a whole host of W3C standards, recommendations and working drafts.
For some evidence that this expanded definition has become the norm, take a look at the HTML5 Test [2], which has been linked here several times. While not anything official, only a handful of the features tested are actually part of the HTML 5 spec.
[1] http://www.w3.org/TR/2010/WD-html5-20100624/ [2] http://html5test.com/