According to Solzhenitsyn a quarter of the population of Leningrad were arrested in and around 1937. Apparently this turned out to be a conservative estimate.

If this is so, your numbers cannot be correct.

And yes, the Holodomor counts too.