SPOILER ALERT: sort of.
Yep exactly. Once you take a look it absolutely has to come from Jack because you are correct in that if it were to come from Spencer then it only be 6 generations. Jack is the only one left that can possibly pass down the John name to make John IV and Tate to be the 7th generation. Also John 1 was his dad so it fits perfectly and neatly. Now we know the missing link in the family tree! That is the only possibility now.