Proposal, plus extra option for newly added Pacific View site, heads to City Council for approval