The last one: leave all the white wires connected together, and add the new ones to them. You have everything else correct, including your deductions about the incoming and outgoing wires.

One suggestion for you and everyone: make new paragraphs every so often; it makes for easier reading.

Larry
www.fineelectricco.com