If you're not scared of dropping some more cash on it, you should look into the Dell XPS line. The basics are very serviceable and it has very decent specs and performance.
Mine's been running Arch for almost a year without any hardware issues so far. I also manage to pull roughly 8 hours of development out of a full battery.
I found that mailcow is a bit too heavy on the requirements. Instead I've started using mailcow (https://mailcow.email/) which runs a mail server in docker.
It's a bit less of a hassle to actually start up and keep maintained.