I prefer your first term.
_________________________
It's Shotokan not Shoto-can't!!!