Gigabyte AORUS (intel) VS ASUS ROG Strix (AMD)

[CK74057]

hi there, I am looking to buy a gaming laptop at about 2k AUD ($1,500 USD), and I am wondering which one is a better option. Hope that someone can shed some light here

the intel one is Gigabyte AORUS 15P KC with a 10th gen i7 10870H
and an RTX 3060 boosting to 1605 MHz @ 115W (Max)

the AMD one is ASUS ROG Strix G15 with Ryzen 7 5800H
and an RTX 3060 boosting to 1802MHz @ 130W (Max)
 

I would occasionally do some photo editing on my laptop as well, so which one do you guys think is better? (the Ryzen one is about $200AUD/$150USD more expensive)
 

or are there any other laptop that I should be looking at for this price point? thanks
-------------------------
Additional Upgrade:

10870H -> 11800H = about $450 AUD ($330 USD)

RTX 3060 -> RTX 3070 = about $550 AUD ($400 USD)
Are the increase in performance going to justify the cost of the upgrade?