Rihanna's music comeback edges closer as she lines up a music video shoot