I hope those solar upgrades fix your problem, and you will be able to continue your adventure. It always helps to cruise together with other sailors. I had a similar scenario and had to tow a sailboat into the harbour a couple of times until they finally got their water pump fixed. Stay safe out there.