The only thing I would add is an inline 30 amp fuse since you're jumping past the fuse block and going directly to the battery.

Hey Mailman, does that bike ever see any dirty roads? That's the cleanest I've ever seen those areas on a bike and I thought mine was clean...

A positive attitude may not solve all your problems, but it will annoy enough people to make it worth the effort. Herm Albright (1876 - 1944)