I would just go with a new regulator and motor, that's what I ever did when I replaced them the cables in them tend to wear and break or come out of place. Always bought them like this rather than just a motor:
How tough of a job was it to do? Any special tools or advice?