Yes that is a better composition, and yes it is a little busy. One trick to shooting wide angle in a busy environment is to try and isolate a single subject in the foreground by getting close to it, in this case I might try getting down close to the water in front of the falls and let the entire foreground be taken up by it.
This is a kind of similar waterfall I photographed about a year ago.
Trillium falls II
by Clay Carey
, on Flickr
You are doing the right thing by asking for honest advice, and you have some great photos on your flickr. Best of luck.