Alan, it's your choice in the end but I personally feel you have missed the boat with PV until they are viable in their own right, ie more efficient or a lot cheaper then look at alternative ways to invest your money.
Good luck with the canal cruiser.
You mention battery systems but did they factor in the life of these expensive batteries. If they need replacing every 8 years or so, then it is not looking so good.