I don't advise to wait, SP 2017 is really good machine, just avoid the 4 GB RAM thing if you can. The reason I am saying not to wait, your needs are precise, secondary device, you are not looking for a power-house here, so the dual core CPUs are more than enough.
Add to that, Surface Go was just...