Yes, I was agreeing with him on that point.
I agree with your post. However, I would just like to add that the use of the term passive gravitational mass in the universal law of gravitation is just a convention. It is not necessary. The split of gravitational mass into it's current two forms, active and passive, did not even exist before 1957. For example, when you apply Newton's second law to the universal law of gravitation to get the acceleration of mp, you are canceling out the passive gravitational mass mp in the universal law of gravitation with the inertial mass mi in Newton's second law. If they were not the same then you should not be able to do this. Having three different types of mass can be quite confusing.