Johnny Griffin, Machito & Herbie Mann