With all due respect to Von Neumann, intuitively I would change it to use the information in the two coins: one for (X, Y) and another for (Y, X). Not the first.
Yes, and as the second coin carries no information (because we are focusing now on sets of two different consecutive outcomes) both your and JvN's protocols are equivalent.