Combine all ingredients except for avocados in a large bowl and mix well. Cover and chill at least 30 minutes and up to over night. Right before servings, add avocados and fold gently, being careful not to mash avocados. Garnish with more chopped cilantro if desired. Serve at room temperature.