Improved average wait calculations