You can put whatever nvme drive is available today on any thinkpad or professionnal laptop from Dell or HP.

I believe all brands offer some laptops with hidpi screens.

The only part where Apple is unmatched is in battery life but you mention it is not a strong requirement.