New system purchase, suggestions?

Hello all, I am sure this question has been asked ad nauseam, however my searches have not provided the answers I seek.  Can you spare me a few minutes of your time, and advice??  Thank you in advance!

I have a dell laptop, and the full 2017 adobe cc suite subscription - been a subscriber for 2 years now.  I mainly use PP and AE, with a little LR in there too.  But I am always learning (mainly from you kind folks)...and as you have probably guessed, no matter how powerful my dell SSD 16gb laptop is, it just can't handle the work...and my last project has pushed me to the limit of my frustration, especially considering how much I pay for adobe - seems a waste if I can't use it to its (and my) potential.

Now, let's also keep in mind I am not a professional like many of you here, this is a hobby that I use 99% for drone footage I capture for myself and clients.  I have already spent a pretty penny on the drone, and accessories over the years...but truth be told, I have already made back my initial drone investment...so we are good there, at least as far as the wife is concerned.  But now I find I am wasting my own time...trying to scrub through footage, waiting...and waiting...for renderings and other formatting to complete...all the while my laptop is running at 100% - and piping hot...surely I should take the next step, and get a proper machine for this work load.

I think my next investment...in this hobby...should be, and rightfully so, a machine to properly, and in a timely fashion, handle my workload...I am a windows guy through and through.  I am sure I could be easily talked into a beautiful $3k tower and 37" monitor...but let me just say that I am not oozing with cash, and I live in an apartment...space is a consideration...likely, whatever I get will live on our unused dining room table. 

I'd like to say my complete budget...for everything, would be about $1600.  There is wiggle room...but let see if you fine folks could help me with that budget in mind.

Thank you all for listening...I will be quiet now and just learn....thank you!