What, exactly is the chain rubbing on? From you initial description it sounded like the chain as it enters the lower jockey wheel is rubbing on the upper jockey wheel. From the latest pictures, this rubbing is not occuring, so if there is still rubbing, it is coming from somewhere else.
And, looking closely at the first pic you posted, there is some clearance between the chain and upper jockey wheel there, too.