On your hot water flow issue, the thermostat is not an issue as the heater hot circuit bypasses it. I would guess that you used tee's in your heater lines runnig the two circuits in parallel and the engine coolant is taking the path of least resistance and flowing mainly to the factory heater...