I agree with this, and I think it should have been like that from the start, because having to drink his cum only if you're kind is kinda stoopid.
Also: have a variation of his mornin' wood scene where he wakes up in the midlle of it and just rolls with it, so PC decides to either finish it...