There is always a wee bit of danger when buying a new computer and basing the spec on your *current* processing requirements.
Unless you intend changing your computer every year to keep abreast of trends, then you can be pretty sure that, a year from now, your requirements will have changed - whether it be 60Mp Raw files, a new, more resource-hungry, version of Lightroom, a new interest in video, or whatever.
I guess the only realistic answer is to buy the biggest, best and fastest your budget will currently stand.