Did he get Tony Soprano'd at the end?

Soprano didn't get whacked, we the viewer got it, as we were the only witnesses that could cause trouble.
And no, it's more likely he threw himself off the waterfall, after getting bodied by a kid AGAIN (comes time as an old fuck you understand it's the younger element's turn at things and time to step aside).