AMD Ryzen is coming soon (next month), since you are going to overhaul your CPU platform only so this is worth to mention here, but you can decide whether to wait or not
Intel Core i7 7700 - RM 1499
Asus ROG Strix H270F - RM 689
Avexir Core 16GB (8GB x 2) DDR4 2400MHz RAM - RM 499
GPU re-useSSD re-use1TB HDD re-useSeagate Barracuda 2TB HDD - RM 319
PSU re-useNZXT S340 Elite - RM 469
Total: RM 3475 (Jayacom price inclusive of GST)
Optional upgrade:
1. i7 7700K with Z270 (for OC purpose)
2. 3rd party CPU cooler
* If you wish to switch to WD for the HDD, please take note that WD Blue 2TB model is running on 5,400 RPM and it is significantly slower than other models on 7,200 RPM.
Based from the preview and demo, the new lineup seems promising. Might as well wait and see the real world benchmarks and tests from tech enthusiasts.