Agree with your second point, disagree with your first interpretation. Matthew was pretty well off, too.
Show me one place in the Bible were a righteous man was called a ‘rich man’. The only one maybe, was the man who buried Christ in his tomb, but I don’t think he was considered righteous. Every man called a ‘rich man’ was evil, but not all men who had riches were evil.