McCarthy ditches idea to boycott the Capitol riot panel and finalizes GOP roster