I doubt there will be a Ryzen 7 APU, because the Vega 11 GPU already takes as much space as a CCX on the die. This means that in the current gen of Ryzen, the max APU config on the AM4 socket would be 4 cores/8 threads + Vega GPU (not sure whether AMD is planning on something bigger than Vega 11), which is what we got with the 2400G.
If you want more graphics performance, you'll have to go the way of R5 1500X + RX 560 (or + GTX 1050)