Interesting you bring this up, my sensei was just talking about this very subject the other night. According to sensei the story involving Musashi the sword master is correct. The Jo originally started as a longer staff.
The confusion may come in because many of the movements we do in aikido with the jo are based on the spear.
Hope that helps.