sounds like a "plan" to have that dump load (diversion mode charge control) set just a tad higher than the solar controller. hope others may have more to offer.
That would work, and be the simplest.
When the controller set up for solar sees the battery reach regulation voltage, which will not take a long time with that battery, the 800W of solar will not be 'making' any power.
Seems a shame to have 800W of solar pretty much not doing much.
Send the excess to a water heater sounds pretty good to me. It would add some cost and a bit of complexity.
For an idea of the power that would be 'not made', the lower element in a typical electric water heater is around 1600W? Seems a shame to have nearly half that much power available to be made, but not made or used.
Usually I am fairly anti water heater, but this system will have enough spare power to make it feasible, IMHO.
G-