The point that I raised was that the question is not so much between Pentecostal and Charismatics as both have in most part agreed over the years. The question should be more with how both of these groups differ with post-charismatics (Third Wave movement).
When questions such as these arise, there is often a lot of confusion with the terms Pentecostal, neo-Pentecostals, Charismatic and neo-charismatic and Third Wavers. The WoF movement is essentially a subset of the Pentecostal movement though its distinctives should never be associated with classic-Pentecostal beliefs.
Pentecostal:
A denomination that has always held to a Full Gospel Theology (AoG).
Charismatic (during the 60/70's they were also called neo-Pentecostals)
Congregations that have adopted (or partially adopted) the Full Gospel while still maintaining their links with their denomination; ie, Anglican, Methodist, Presbyterian etc.
Neo-charismatics / Third wave movement:
This was popularised by John Wimber and the beliefs of this group differ from historical Charismatic teaching. Many congregations have been established along these lines and who have no connections with any historical denominations.
I would add some more details to your definitions. I am very well familiar with differences between pentecostal, neo-pentecostal (word of faith), and third wave.
Apart from my attendance in a traditional Pentecostal church, I also spent 3+ years in a word of faith - type church. Then I spent 12 years at the Toronto Blessing, which could easily be dubbed the "king" of third wave.
Although I have never personally attended a traditional Charismatic church for any considerable period of time I have visited them on occasion, and as I mentioned before I have lots of videos and tapes from that era.
Having said that, your definition of traditional Charismatics is ambiguous enough to include the "Toronto Blessing" AKA Catch the Fire Toronto with one exception - they are not from the 60s and 70s.
I say this because Catch the Fire Toronto has many "chicks" or follower churches that are denominational churches that have "adopted (or partially adopted) the Full Gospel while still maintaining their links with their denomination; ie, Anglican, Methodist, Presbyterian"
In fact, right now I minister in music at two churches with background in Methodist and Presbyterian. They have fully adopted the "Toronto Blessing" theology, but have maintained their place within their denomination.
Please keep in mind my attendance with the aforementioned churches was more than the average Joe. I go every time I can, whether the doors are open for services, or whether the doors are just open. But recently I haven't been able to do that seeing that I have 5 children at home.
I could go into explaining the difference between Pentecostal, neo-Pentecostal, and third wave, but doing so in this post may be excessive. If need be I will in another post.
But as far as I can see, the major difference between Pentecostal (and neo Pentecostal), and Charismatic (and neo-Charismatic) is the issue of tongues.