Looks good so far. I like your custom fan controller ... is it working okay (as in no whining when it's turned down from 100%?).
Now hurry up and show us your wiring solution (please ).