VVS 2020?

I was doing some number crunching regarding combat aircraft upgrades and procurements for VVS until 2020 after reading various magazines, internet news and insight from knowledgeable persons. I didn’t even started touching transports and helicopters, though things are interesting in those departments too.

So, any corrections and updates from the more knowledgeable folks? Thank you.

1. Upgrades:

MiG-31BM- 90-120? about 37 delivered (to 4 units?).
Su-25SM- 130-155? about 80 delivered.
Su-24M2- NAPO upgrade, 30 delivered.
Su-24M-SVP24- Gefest&T upgrade, between 30 and up to 50 reported to have been already modernized/delivered, to equip units in 3 military districts? (up to 70 total if each unit has two squadrons?)
MiG-25RBM- 10?
Su-27SM- 55 all delivered.
Tu-95MSM- about 30?
Tu-22M3M- 30
Tu-160M- about 16 (all?)
A-50U- 12 (1 delivered)?

2. New built aircraft:

Su-27SM3- 12, all delivered, plus possibly 12-24 more (for one unit in Belarus and one unit in the SMD)?
Su-30M2- 4 delivered plus 16 more.
Su-35S- 48 (about 10 delivered?), plus another 48 planned.
Su-30SM- 60, plus another 30 planned.
Su-34- 124 (about 29 delivered?).
MiG-29SMT/UBT- 28+6 all delivered, plus 16 then about 20 planned?
MiG-35S- 24-48 planned?
MiG-29K/KUB- 24
Su-25UBM- 16?
T-50- 60-70 planned initially.
Yak-130- 67 plus 30 planned.