Ah right, I should have explained it more clearly.
Basically: for native IPv6, don't advertise MTU, so it will use the same value as for IPv4 (=1500).
For tunneled IPv6, use the 1480 value (1500 - 20 bytes IPv4 header overhead = 1480).