I can't believe Rihanna and her team thought this was fit to be released in this form. I also don't think their strategy was to have fans rework the song and make it better.
I like it a lot, the production sounds much better and more alive, especially the 3:30-3:50 part. The other re-work got taken down, so I'll put this in the OP for now until you complete it!
The rework is far more enjoyable. The issue with the song is definitely the large gaps in the verses. Are we supposed to add our own lyrics there or something?