Yeah, think that will keep both of you happy. And it does carry a good quantity of fuel and water and have space for spares etc.
Congrats on the new boat. Always fun then getting her ready.
Caio,