Divers have plucked two more bodies from a sunken passenger ferry and scrambled to plug an oil leak in the wreckage after a collision with a cargo ship.