The short story "The Fourth Toast" in
Strange New Worlds III has Castillo still alive during the time of
The Next Generation, though I'm afraid I recall not a single detail beyond the fact of the story's existence and Castillo's presence.
Vulcan's Heart also covers this period.