Goff switches to West Surrey Racing for 2016 