So, I might need to repunch green and green/white downstairs or orange and orange/white upstairs?

This is on the assumption that the packets are being transmitted from downstairs and received upstairs correctly, but either not being transmitted correctly upstairs or being received correctly downstairs.

What I might do is fake it up with the face plates and a short segment of cat5 to ensure that I've got the crossover-ness sorted first.