I would suggest moving to separate charger and inverter. As you say, fewer eggs in one basket.
While my experience on previous boats with Xantrex has been okay, I do hear lots of grumbling about them where I sail (mostly Chesapeake Bay, Bahamas, and Eastern Caribbean).
I have had great luck with Mastervolt, and also hear very good things about Victron. E-mail if you want direct contact with Annapolis area installers of this equipment who are very forthcoming about the experiences of their customers.
sail fast and eat well, dave
S/V Auspicious