Randy,
You did not say how much time you have spent cruising on your boat. It might be a good idea to go cruising for a while and determine how large a watermaker you need, how many solar panels (do you have electric refrigeration?), might you also want a wind generator?, if you have a gen set does it bug you (and yours) to run it?, etc.
Also, if you go cruising you can ask your fellow cruisers what works (and doesn't) for them, what yards are good and who supports their equiptment and meet the people who will be doing the work.
As you move around you can visit Antigua and Trinidad, both good for what you are looking for. Get a copy of Chris Doyle's cruising guides as they cover the services offered on the various islands.
I know its exciting to think about all those systems working but if I was in your shoes with a bareboat coming out of service I would check the
rigging (standing and running), inspect the rudder and steering assembly, inspect the sails and service the engine(s) and go sailing before I threw 20 - 40K at the boat.
Good luck and look for us in the US and British Virgins this winter,
George Banker
Durango, CO
FREIGHT TRAIN V