Thanks PKD. I had 1D wrong, having used epic, not epos : which gave me problems with 20A. Even so, I'd considered Cholo, though that's an offensive word isn't it ? But thanks anyway, that's obviously correct as far as the puzzle goes.
My down extra words were CBLM. Wasn't sure whether the last would be M or H...I think the F is required in 7.