Low to Mid Range PC Upgrade

Hey guyss need help here~

Currently, I have this setup:

• CPU: Intel Core i7-7700
• GPU: NVIDIA GeForce GTX 1060 6GB
• RAM: 16GB DDR4
• SSD: 250GB
• Motherboard: ASUS EX-B250M-V3

I'm planning to upgrade my PC this year. My main focus is 1080p gaming and some light video editing on the side. My budget is around $600 to $800 (IDR 10–15 million).

So far, my planned upgrade path is:

• CPU: Intel Core i5-12400
• GPU: NVIDIA GeForce RTX 4060
• Motherboard: B760M

Do you have any suggestions or alternative recommendations? I'm completely open to switching to AMD if it offers better value for money.