Apologies for the double post.
Out of interest, I tried making the changes you suggested. Hopefully the MOSFET is correct now, I see I'd managed to wire it backwards earlier. I'm using two voltage dividers to ensure that each gate voltage remains below its corresponding drain voltage. Just to be clear, S2 is a DPDT switch and JP2 is the battery connection.
Does this look any better?
