Haiku Help

[spin13]

Recently asked to write a haiku, despite having no experience with the format (or any artistic form of Japanese writing) besides it's English equivalent, I obliged. This is what I came up with (kanji, hiragana, attempted meaning):

剣の心
川は流れる
巨波は切る

けんのしん
かわはながれる
きょははきる

The mind of the sword;
The river flows,
The billows cut.

I'd be interested to know if this is grammatically correct, both in the context of poetry and otherwise. Also, do the '-i' + 'y-' combined kana such as the 'きょ' count as a single kana for the purposes of the 5,7,5 count and what is the name for these combinations, in both Japanese and English. Thank you.

-Eric