Video editing has always been a real resource hog.
My suggestion is that if you're getting comfortable with your current software, I'd stick with it and really beef up the following critical components:
- Fast CPU (preferably either Intel or maybe AMD's upper end models).
- Lots of RAM (more than 8GB will help).
- Fast disk space really helps (preferably Solid State Drives).
I personally prefer Macs for my photo and video work as it just all "works" and the high quality of the hardware-software integration means that I can spend more time on my work rather than fixing/debugging/building computers.
I currently use a 2012 Retina MacBook Pro (Intel i7 2.6GHz Quad, 16GB RAM, 512GB SSD, 2TB external storage) hooked up to external IPS monitor, storage devices and it is a really good portable workhorse for the kind of hobby videos I make.
If you get into colour grading, it is important to colour calibrate your display regularly with a monitor calibrator every few weeks (these are not expensive). On the Mac, my video editing software was originally used iMovie for years, and then moved to Apple Final Cut Pro X.
But if you're comfortable with your current operating software, I'd beef up your computer as required for the job you have.
I also archive all of my video footage so that I have at least one backup. Good thing cheap and big hard drives and fast interfaces like USB 3 and Thunderbolt are available.
Here is my recent video then with the Phantom Vision+. Nothing too flash, a park outside of my house.