No, both those orders are correct. In "difficult to decide who X was", the longer the phrase X, the more the tendency to move "was" forward, so as to prevent it getting lost at the end.
New words, one handy idiom, and a 2-minute quiz — delivered to your inbox to keep your streak alive.
viborrrAnd how does one decide when phrase X is sufficiently long to warrant the swap?There is no fixed rule to determine this. It just depends how the author feels.