I consider it a trilogy by that metric. The only thing that bugs me is Marty all of a sudden hating being called a chicken, but I head canon that out. Of course, my head canon kind of ruins it being a trilogy because I believe in the sequel we are watching the Marty who travels back in time at the end of the first movie.