If there is another gearing stage inside the hub (missed that one), then of course you would calculate with the tooth count of the last gear.
In that case, your assumption is correct, and you should get twice the top end speed, on paper, of course.
Double check if shimano is really saying that...