It looks from this like several million will be the correct figure.
I heard that only about 3 million bitcoin addresses are used. I would say that the number of addresses > number of users.
Myself, I have used dozens of addresses, and don't consider to be a heavy user of addresses.
I use at least 100 addresses per year, and i don't consider myself a heavy user. Just imagine how many addresses do Bitcoin businesses use.