he always had a super team. So No. If he ever does it in a completely new league with an average team then he will be the goat.
Winning a world cup with 5 penalties does not make you the undisputed goat. Especially since he wasn't even the main reason Argentina won, it was Martinez he saved them from Netherlands and France