I hope that you weren't hit too hard by the freeze up.
One solution to your initial problem may have been to turn the burner knob down lower, lowering the temperature of the water coming out of the unit. This would mean that in your
shower you'll be asking for more of the flow to be coming from the heater.
I've found it can be challenging to find the sweet spot with these things. Showering can be a very active exercise...
I think my unit is a 4.8GPM "TC-Home" (pretty sure it's the Marey in a different case), 40PSI water. When dialled in it works quite well, though I prefer showering from a hot tank of water as it provides near-constant temperature where as the on-demand unit is more prone to wander higher in temperature --> if you turn the hot water down at the shower the water in the tankless heater creeps up in temperature, leading you to further turn down the shower, which further increases the temperature in the unit... eventually you have to shut if off and wait a minute or so before starting over.