Here is the revised schematic. I've also upgraded to the Victron 150/100 MPPT. The more I've thought about it, I don't think trying to save a couple hundred bucks is worth limiting the solar potential, and it's physically smaller, which is a benefit for me.
Also, regarding the rigid panels...