Let's see, so if the production variant is ready for testing, it'll probably fly on a testbed for 2015-2016 (either a J-11 or Il76).
Then in late 2016, or more likely 2017, they start flying it on the LRIP J-20s.
2019 for a WS-15 J-20 sounds most likely keeping with General He's remarks. You could aim for a 2017 handover to the first squadron by speeding up the pre-J20 flight tests (like starting now, on more platforms to maximize data collection), as well as flight testing more J-20s with WS-15s, but that's going to be very expensive, and more operationally risky in the short term.
What you just laid out is roughly what I've been thinking for the past year or so. I have a theory that the PLA will become less risk adverse with military development as they get a better handle over newer technology, which means the conservative timelines we're used to to make our projections may be accelerated somewhat. This presumes that the project goes smoothly and they don't encounter setbacks however, which is always a possibility.