Viñales happy on return to team