Yes and Yes. Yes..we punch down additional drops all the time…just be careful and take your time. And the colors should be consistent. Crossing over is not necessary.
When running cable consistency is the key. If you start making changes when you have to come back and look at the cables in a year are you going to remember what you did differently? Probably not. Always stick with the standard wiring diagrams, and try to always use the same one every time.