The fix for the extra AP issue works for me, thank you!
However, you indeed seem to be stuck in a self-fulfilling prophecy. The fix caused a regression: the remaining action points are not converted into the movement points, but are added to the movement points and preserved. So, effectively, the grenade adds movement points now.