Rising Dragon: Yes, that was the Endless Waltz manga ending with art by Koichi Tokita. It's stated in the credits page that Sumisawa also wrote this.
This is the ending I subscribe to in head!canon due to the heavy shipping potential. Wonder if this is the one Sumisawa's drawing from? Or is he going with either the OVA or movie one?