In the new national class quest.. Do my class points reset if I change class?

Yes, unfortunately.

You start over at zero with the new class, but I believe that if you switch back to your original class, your skills are still where you left off. I switched to trader, but when I look at the skills under my old class (raider) it still shows everything I unlocked. I have not actually switched back to raider yet though.