Yeah, just sand the surface of the pads. As for the cleaning, you should take the master cylinder out of the lever, clean inside the body and shit, then whack it all back together, and re-bleed. That WILL sort it, because from what you've described, you have air in your brake.