Quarkonium production in an improved color evaporation model