Just a little extra work... Pull the wall plate out, repunch the wires in T568-B, put the wall plate back in. This becomes a problem because I'm trying to keep things neat. The switchrack I set up with 3 48-port switches so far is 1 -> 1 2 -> 2 etc. from patch panel to switch. Makes it much easier to manage and looks nice. It also requires that when you move something, you move it to the correct termination on the correct patch panel.
Then there is "the spaghetti room". That'* going to be a fun one to try and clean up.