The raw water intake to the head should not be next to the head Thu hull discharge. They should be on opposite sides of the boat to prevent pumping in the waste you are pumping out. From the Wye valve next to the bladder I would extend the discharge to a deck plate so you can pump out at a pump out station. Do you have room for a roto molded tank?