The rate of hot water delivery is unusually poor. Measuring the water flows will help find the reason. I suspect you have a half-inch incoming water main, and some other restriction.House is 60s I don't have room for a system boiler so combo only real option.
Is 30-40 secs poor then to get hot?