Things are escalating fast between US and Iran. For now I suggest you stay bullish on oil. Gold is a bit over bought at the moment so even if it pulls itself to 1600 directly, there is no way but to give at least a 200 pip correction before moving higher (in case a direct conflict happens between the two)

For now, market is a panic. So we can expect it to cool down in a couple of days if nothing big happens.