I am not agree with your point no 4 & 5 because when you r validating cleaning method at a time of validation cleaning method shold be complete. Cleaned till result passes is not acceptable at all (which is described in ppint no 4).
Also described in point no. 5 that three runs are completed , cleaning quantities and runs are fixed is not acceptable because u are here validating pre-established cleaning method . Once you successfully validate it will be implemented at shop floor with scientific evidence that your cleaning method is efficient to remove contamination up to acceptable level. I suggest first prepare proper cleaning method , once you get confidence you start process validation &cleaning validation parallaly. Other points 1,2,3 are ok