If you are going for the desktop and going to be doing a lot of editing, may I suggest you add an Ultrawide monitor? I did and it’s amazing the difference it makes to ease of use. I bought this one and it didn’t add that much to the cost of the system.
Editing luxury! Be the envy of your mates. 
S.