Made a mock-up trying to fix the Force Kick:
Could use a lot of work, but the shot is locked off so it can be done. I did something else to the picture besides fix the kick and replace the lightsaber, but I can't remember what it was... ;-)
Nice suggestions Ruja, added them to the list!