I would prefer to keep the old logic for all connections. Reason being that this heartbeat is more accurate. 

If we have issues with methods getting called out of sync it'll be more obvious when looking at counters