New master plan would address chronic issues affecting Armourdale for decades