I ended up getting 2 hot water tanks and putting them in series. Endless hot water doing it that way. I’ve also plumbed it so that if one fails I can adjust a few valves and run on one tank until I can fix/replace the other.
I should note, I live 160km from the nearest city so I can’t just call a guy out to fix things.