New deal for Norwich top scorer bolsters Canaries survival hopes