Yep you have to take delivery once it's ready, otherwise everyone would be waiting for new plate time and could mean old models registered on newer registrations than they should be
When you had the tank replaced did you have the system bled? Did you change the expansion tank cap? As seals can fail and you wouldn't know if it was leaking from there. Could there be an issue with the heater matrix? (Any wet carpets etc?)