Currently what I do is unplug the power when shutting down, works for me (same laptop).
I tried many combination of grub config, but they never work.