Hot water tap gets to hot to handle

Yep, sounds about right.
I suggest not running it as long and turn down your boiler settings.

Gas or electric heater? What's the Thomastat setting? Back to you, Tom