What I did was run the non OEM accessories off a separate fuse block.
Sounds kind of like what you are doing. I used a Blue Sea type box with 6 circuits. Box is fed from a 20 amp inline fused wire to an on/off switch that is hooked directly to the battery.
Each accessory has a 15 amp fuse. I...