One trick to making wiring a little more simple and efficient is to employ the use of three wire (black, red and white) NMD Cable to leap frog an unswitched hot over a switched light outlet.
So, the black hot enters the switch box, marrettes to the outgoing black hot and a hot pigtail that goes to the switch. The outgoing red is attached to the other terminal of the switch, and the whites (and grounds) are marretted together.
When the three wire cable enters the light box, the red is wired to the hot terminal of the light fixture, the unswitched black hot marrettes to an outgoing black hot, and all the whites (incoming, outgoing, and pigtail neutral from light fixture) are marretted together.
