Ok....
IMO...you have a great free flowing heady poem. So if I were you...I would pull out some of the lines that you love and go with a feeling you are writing about...are sad,happy, frustrated, write to that one emotion. I would boil down the lines to follow that emotion...another suggestion is don't rhyme unless it makes sense.
Good luck with the rewrite...