If you don't include the 4th and 5th movies, it would fit. Once Conner is killed and Duncan lives on, it doesn't fit the original film anymore.
Of course, with the Original Film, if the series is the prequel to it, then you would have to accept that Duncan dies at some point before the final...