Kimarite related question

[Manekineko 200]

Ah, the basho is over, it's time again for inter-basho fun. This question came to me while I was swimming my not-quite-daily rounds... My thoughts floated to Takanohana, his intai, and how nevermore the announcer will proclaim: "Kimarite wa uwatenage. Uwatenage de Takanohana no kachi!" (He did have the most wondrous uwatenage...) But then I started wondering... is it "uwatenage de" (which would be correct if you take uwatenage as a noun), or "uwatenagete" (if you take it as compound verb from "nageru"). I remembered that for yorikiri the phrase is "yorikitte", "te" form of verb (gerund).

So I ask now those of you who with good ears and/or good command of Japanese, what exactly is the form for each and every of known kimarite? For your convenience, the kimarite are grouped by ending verb... I suppose that all kimarite derived from the same verb behave the same, which might or might not be correct. Thank you.

* DASHI > DASHITE or DASHI DE

(Kime-, Okuri-, Okuritsuri-, Oshi-, Tsuki-, Tsuri-, Wari-)

* GAKE > GAKE DE or GAKETE

(Chon-, Kawazu-, Soto-, Uchi-, Okuri-)

Hikkake -> Hikkake DE or Hikkakete

* HINERI > HINETTE or HINERI DE

(Gasshou-, Kaina-, Kote-, Kubi-, Shitate-, Uwate-)

* KAESHI > KAESHITE or KAESHI DE

(Ke-, Kiri-)

* KOMI > KONDE or KOMI DE

(Hataki-, Watashi-)

- I'm pretty sure I heard "hatakikonde" in announcements...

* NAGE > NAGETE or NAGE DE?

(Harima-, Kake-, Koshi-, Kote-, Kubi-, Nicho-, Okuri-, Shitatedashi-, Shitate-, Sukui-, Tokkuri-, Tsukami-, Uwatedashi-, Uwate-, Yagura-)

* OTOSHI > OTOSHITE or OTOSHI DE

(Hiki-, Maki-, Okurihiki-, Okuritsuri-, Sokubi-, Tsuki-, Tsuri-)

* TAOSHI > TAOSHITE or TAOSHI DE

(Abise-, Kime-, Okuri-, Oshi-, Tsuki-, Yori-)

* TORI > TOTTE or TORI DE

(Ashi-, Kodzuma-, Suso-, Tsuma-)

* ZORI > ZOTTE or ZORI DE

(I-, Kake-, Shumoku-, Sototasuki-, Tasuki-, Tsutae-)

* Kimarite with verbs that do not belong to any of the above groups:

Amiuchi > Amiutte or Amiuchi de

Ipponzeoi > Ipponzeotte or ipponzeoi de

Katasukashi > Katasukashite or Katasukashi de

Ketaguri > Ketagutte or Ketaguri de

Komatasukui > Komatasukutte or Komatasukui de

Mitokorozeme > Mitokorozemete or Mitokorozeme de

Nimaigeri > Nimaigette or Nimaigeri de

Sabaori > Sabaotte or Sabaori de

Susoharai > Susoharatte or Susoharai de

Ushiromotare > Ushiromotarete or Ushiromotare de

Yobimodoshi > Yobimodoshite or Yobimodoshi de

Yorikiri > Yorikitte or Yorikiri de (again, pretty sure I heard "yorikitte")

* Kimarite that are not derived from verbs, as far as I can see:

Oomata > Oomata de

Oosakate > Oosakate de

(Saka)Tottari > (Saka)tottari de

Sotokomata > Sotokomata de

Soto-, Uchi-musou > Soto-, Uchi-musou de

Utchari > Utchari de

Zubuneri > Zubuneri de

[Kintamayama 47,132]

I am by no means a Japanese expert, but I'll try with my healthy insticts..I erased what I think is wrong.

* DASHI > DASHITE

(Kime-, Okuri-, Okuritsuri-, Oshi-, Tsuki-, Tsuri-, Wari-)

* GAKE > GAKE DE

(Chon-, Kawazu-, Soto-, Uchi-, Okuri-)

Hikkake -> Hikkake DE or Hikkakete

* HINERI > HINERI DE

(Gasshou-, Kaina-, Kote-, Kubi-, Shitate-, Uwate-)

* KAESHI > KAESHITE

(Ke-, Kiri-)

* KOMI > KONDE

(Hataki-, Watashi-)

- I'm pretty sure I heard "hatakikonde" in announcements...

* NAGE > NAGE DE

(Harima-, Kake-, Koshi-, Kote-, Kubi-, Nicho-, Okuri-, Shitatedashi-, Shitate-, Sukui-, Tokkuri-, Tsukami-, Uwatedashi-, Uwate-, Yagura-)

* OTOSHI > OTOSHITE

(Hiki-, Maki-, Okurihiki-, Okuritsuri-, Sokubi-, Tsuki-, Tsuri-)

* TAOSHI > TAOSHITE

(Abise-, Kime-, Okuri-, Oshi-, Tsuki-, Yori-)

* TORI > TORI DE

(Ashi-, Kodzuma-, Suso-, Tsuma-)

* ZORI > ZORI DE

(I-, Kake-, Shumoku-, Sototasuki-, Tasuki-, Tsutae-)

* Kimarite with verbs that do not belong to any of the above groups:

Amiuchi > Amiuchi de

Ipponzeoi >ipponzeoi de

Katasukashi > Katasukashi de

Ketaguri >Ketaguri de

Komatasukui > Komatasukui de

Mitokorozeme >Mitokorozeme de

Nimaigeri >Nimaigeri de

Sabaori >Sabaori de

Susoharai >Susoharai de

Ushiromotare >Ushiromotare de

Yobimodoshi >Yobimodoshi de

Yorikiri > Yorikitte

* Kimarite that are not derived from verbs, as far as I can see:

Oomata > Oomata de

Oosakate > Oosakate de

(Saka)Tottari > (Saka)tottari de

Sotokomata > Sotokomata de

Soto-, Uchi-musou > Soto-, Uchi-musou de

Utchari > Utchari de

Zubuneri > Zubuneri de

--------------