2018 is the year I had calculated, too.
Which means, if we also go by the Hebrew calendar, the end of the generation is 2017, not 2018.
FWIW, I think we tend to try and fit things into prophecy to keep to a time line. No question the day will come and it sure does seem like it will be sooner rather than later.