You can still get Neopan 400? Where did you find this hidden stash?
I'm relatively confident in my ability to distinguish between some films. I don't think I would have guessed Tri-X in this case, though, which leads me to wonder how much digital processing you did after the scan.
I favor Delta 100 myself these days, and have gone back to using Pan F 50 sometimes.