Love the way you are using those little LED lamps. I have them also placed in 4 places on the wood parts of the ceiling. They are great when you don't need a lot of light (like during dinner or drinking a glass of wine) and don't need to be draining the main battery. I even un-screw the main part of light from the ceiling (leaving the mounting base in place) when I am bouncing down dirt roads so they won't pop off.
Craig, I agree with you heat shrink works really well. About half way into all the wiring projects I started to use heat shrink and will always use it. It forms really well and doesnt come loose when heat is around.