OP could add a vent thru the wall tankless feeding the standard tank, the 2nd standard tank would solve all the common tankless issues while supplying nearly endless hot water.......
or set the current tank to MAX temp and add a tempering valve.......