Interesting to note that desktop Ryzen APUs and mobile Ryzen chips (which share pretty much the same die) are always one core generation behind their desktop counterparts.
2017 - desktop Ryzen 1000 (Zen), no APU, no mobile
2018 - desktop Ryzen 2000 (Zen+), Ryzen desktop 2000 series APUs and mobile Ryzen 2000 series (Zen)
2019 - desktop Ryzen 3000 (Zen 2), Ryzen desktop 3000 series APUs and mobile Ryzen 3000 series (Zen+)
2020 - desktop Ryzen 4000 (Zen 3) if not delayed, Ryzen desktop 4000 series APUs and mobile Ryzen 4000 series (Zen 2).
Really tempted to get an APU. My needs have become modest and I'm actually already running a couple of laptops with mobile Ryzen, one with a 2500U+560X (Acer Nitro 5), another with a 3500U (Acer Swift 3).
NEC V20 > AMD Am386DX-40 > AMD Am486DX2-66 > Intel Pentium-200 > Cyrix 6x86MX-PR233 > AMD K6-2/450 > AMD Athlon 800 > Intel Pentium 4 2.8C > AMD Athlon 64 X2 4800 > AMD Phenom II X3 720 > AMD FX-8350 > RYZEN?