Correct. As I believe the Necessary and Proper power should have only the limits found in that clause. There are occasions where intrastate activity does have a substantial effect on the interstate commerce that Congress is constitutionally regulating, and where it is both necessary and proper for Congress to regulate that activity.
I have used the example of a private pilot flying from one part of the state to another. An intrastate, non-commercial activity that you say should be off-limits to Congress (the FAA).
I disagree. When that pilot flies into controlled airspace, he has a substantial effect on interstate air traffic and his activity may be regulated -- even prohibited.