Option A is the better one in my opinion too. Like it is said in Spain: "Borrón y cuenta nueva" ("Clean up and go again"). If it's mandatory go ahead.