Of the two, the first is correct. I try to avoid complicated things like this: We are looking forward to the visit from you and John. [sounds a little strange, but nothing compared to your second choice]
New words, one handy idiom, and a 2-minute quiz — delivered to your inbox to keep your streak alive.