In his first tournament in 20 months, wild-card entrant Kei Nishikori wrapped up a successful comeback in Puerto Rico with a methodical victory.