Yes correct some shinobi were from the Samurai class at the end "shinobi" was a job.
Do you have evidence for the Ninjato being an auxiliary sword? It's the first time I've heard that to be honest. Most ninjato that are held in museums are 20th century replicas.