What doesn’t really feel right to you about it?
To me an edit that just cuts out the shot with the multiple little appendages would almost be enough for me. The first two don’t really bother me as much. Maybe if BB-8 made a different noise when he smashes his head into it besides, “WoooOOOOoooow!!” could help?