Rafa Nadal 'made the right decision,' will play Davis Cup if fit