Mayor, city attorney propose new firefighter pension plan