Sounds about right but I like pictures when it comes to planning wiring stuff.
The last wiring diagram looks good to me, I'd follow that.
Unless you're close to the battery I find it a PITA to pick...