I think you are right. Microsoft is talking about Win 10 being the last version of Windows released and from here on, it will be incremental updates just as Apple does them.
I guess I should post a warning about avoiding Windows 10 like I mentioned above. Windows 7 will be supported by MS (patches) until Jan 14th, 2020, so it's safe to use until then, but not past that. Windows 8/8.1 support goes to Jan 10th, 2023. You'll have to have Windows 10 (or whatever is the number, if they change their minds), by those dates or have your Windows box unsupported (very bad idea now, much worse by that time I'm sure). Alternatively, you could move to Linux or MacOS.