Solomon or Abraham were never described as 'rich man'. They were blessed and had great wealth. The 'rich' men in the Bible usually were men who loved money, and thus are sinners. I think the rich man/poor man is only the surface meaning though, and the author of this piece got the deeper meaning correct.
Agree with your second point, disagree with your first interpretation. Matthew was pretty well off, too.