Laptop 2-in-1 USB-C Chargeable Recommendations

Hi everybody,

I'm in a little pickle of jam and requiring some friendly advice and recommendations.
I am in need of a 2-in-1 laptop, unfortunately not just a touchscreen laptop, it has to be a 2-in-1 convertible due to required uses.
The required features; basically the only required feature is that it needs to be USB-C chargeable. The unit will be heading with me to various locations where I will have no access to power outside of my own powerbanks for a few days at a time. But it does need to be strong enough to handle Lightroom, so basic Photoshop use.
Features that I really would like to have but aren't required are; UHD screen in first place, and numpad in second.

Budget is around the $2k mark.
Deadline is start of July. I leave the second week of July, so I have to have a device by then. (This is saddening as I recently read about the new XPS 13 2-in-1 coming out early August I believe)

I know the 4K screen won't help with battery life, it is a trade-off I am willing to make. And numpads generally are on larger models only, which I am fine with.

Some options I have looked at;
Lenovo Yoga 730 15" - The other day (I believe the sale discount ended yesterday) I was able to customise one, 4K screen, other seemingly good specs, for just under $2k, however I realised that the 15" model isn't chargeable via USB-C, only the smaller 13" model, as well as there's the whole problem with the wifi module, which I was pretty put off by the idea of having to do all that running around to get it replaced with the Intel wifi module.

Asus Zenbook Flip S UX370UA - Asus website states this has a 4k option, however I have not been able to find it anywhere.

HP ENVY X360 - 13-ar0029au $2.1K - 4K screen, everything else seems pretty good, but I am not 100% sure if it is USB-C chargeable.

Dell Inspiron 14 5000 14" Ryzen7 3700U $1.7K - This one caught my eye really early, the only downside is that it doesn't have a 4K screen (or numpad, but I have pretty much given up on that at this stage), however since it is a new model, I haven't really been able to find any reviews about it. Again not sure if this is USB-C chargeable.

If anyone has any other suggestions, or thoughts, I would greatly appreciate the help!