I generally advocate for including Form 1040-X to show that there is no other change to the tax return that results from the change to Form 8606.
