The difference between Cat5e and Cat6 is in insulation and quality of cable, as such if you follow the same wiring guide it will always work in your environment. Category cables can be purposed for many different things, not just networking. The defining elements are in how it is made and the insulation quality, not in the wiring patterns you use.
In fact, I actually recommend you use just Cat6 going forward. The price difference is marginal, the quality of signal is better, and if you use it with gigabit networking you will see more consistant and higher transfer rates. I run a LAN party larger-scale event and we ONLY use Cat6 as we have a 100% gigabit network. The cost difference is laughable, and because we re-use the cabling, it is totally worth it.
EDIT: Cat5 cable can actually use more than 4 twisted pairs of wires, I assume Cat6 is the same. My previous claim that the wiring count is static is inaccurate, however most wire you can buy is only 4 twisted pairs of wire.