Depending what you like the most man. For me, I would go with better CPU. I currently have i5 and I feel like with my editing skills I would use i7 with more pleasure.
If what you have right now is enough for you and you enjoy consoles, then why not? Xbox one is a good console anyways :).
Please tell us the model number. (e. G Intel Core i5-4460 3.2ghz) - Also make sure the core i7 you are talking about is compatible with your motherboard.
I cant really gove you an answer,but what I can give you is a way to a solution, that is you have to find the anglde that you relate to or peaks your interest. A good paper is one that people get drawn into because it reaches them ln some way.As for me WW11 to me, I think of the holocaust and the effect it had on the survivors, their families and those who stood by and did nothing until it was too late.