The heater getting hot quickly would indicate the water pump is OK...
As another test. Put the heater to fully cold, warm up the engine, then set the heater to fully hot. Does it respond in just a few tens of seconds blasting out hot air?
I wouldn't trust a modern car not to have an auxillary electric pump for the heater circuit tho'... What does "the book" say?