Always, always wait until after the credits. It's becoming very common to keep important scenes for after, to encourage the audience to actually stay...
It was obviously not Riku since he's not an Organization member, and why would he want the Peddler to not say anything about Jafar. If anything Riku...
I doubt it'd be clunky if it was assigned to a L2/R2 + D-Pad command and flowed well into combat, it wouldn't be any different from any other combat...
I lied, there are no free cupcakes, but I just got back to GIMPing after a very long hiatus. I found an image half finished and decided to give it a...