Theory 2 seems more likely. I really hope they don't mix Minato into too much. If they do, alright then, but so long as there is a clear distinction between the Uzumaki clan and the Senjus and Naruto himself :)
