Jacob,
I do differentiate between them. Here in this country we have elders in local churches who may not practice the supposed gifts, but who theologically promote their continuance. In the book mentioned above by Waldron (2005), he interacts with some. I think Budgen does also, although his book is dated 1989 -- still, it is excellent.
This following piece I do not assess as being on a par with what I summarized from Waldron, but it may be helpful.
-------
TALKING POINTS AGAINST THE PENTECOSTAL HERESY
1) It is clear that the teaching of a “second baptism” of the Holy Spirit after our true baptism in the Spirit given us at conversion is a lie of the deceiver to confuse the people of God. Paul said there is only “one baptism” (Ephesians 4:5), and this is given us when we are born of the Spirit (John 3:5) and sealed by Him unto eternal life (Ephesians 1:13; 4:30), and this Spirit-baptism that gave us the new life (Titus 3:5) is to be followed by our obedience in submitting to water baptism, as the Lord Jesus commanded (Matthew 28:19; Ephesians 3:5).
2) The poured out baptism of the young New Testament church in the Holy Spirit who was sent forth by the ascended Lord Jesus was the fulfillment of many Old Testament promises of God, such as Joel 2:28, 29; Isaiah 44:3, 4; Ezekiel 11:19, 20; 36:25-27, to name but a few. Jesus had obtained from the Father this extraordinary blessing for His people as a reward for His redemptive work from birth to death, to resurrection and ascension (Acts 2:33; 5:31, 32). This “baptism” was the bringing of the church into union with the very death and life of Christ (Romans 6:3-5; John 16:13, 14; Colossians 2:9-13; 3:3, 4).
3) The outward seal and sign of this inner, spiritual new birth from God was to be water baptism (Ezekiel 36:25; Matthew 28:19; Acts 2:38-42; John 3:5).
4) The miraculous signs accompanying the first outpouring of Christ’s Spirit on the day of Pentecost, such as the “tongues of fire” over the disciples’ heads and the “sound…of a rushing mighty wind” were one-time historical events, and the men speaking in foreign tongues or languages so that all the Jews assembled in Jerusalem from various nations could understand the wonderful works of God proclaimed by the apostolic band, were actually prophesying in these languages (Acts 2:16-18; Joel 2:28, 29). That is, they were speaking inspired and infallible words from God.
5) The continuing appearance of the foreign (including unknown) languages spoken in the church and interpreted were considered equal with prophesying (1 Corinthians 14:5). If there was no interpreter the language should not be spoken in the church (1 Corinthians 14:28). The important thing to understand is that both prophesying and inspired speaking in foreign languages interpreted were revelational gifts, that is, God spoke His infallible and inspired words through these people.
6) The purpose of revelational gifts to the young church was to guide, encourage, and support it during the period before the written revelation of God in the New Testament was finished. Once the Scriptures of the New Testament were completed, God having spoken finally, utterly and completely through His Son (and the Son through His apostles) the revelation from God was completed and sealed. (Hebrews 1:1, 2; 2:1-4; 2 Peter 3:2; Deuteronomy 4:2; 12:32; Proverbs 30:5, 6; Revelation 22:18, 19).
7) It is clear from God’s word that no further revelation is needed, but that what He has provided is sufficient so “That the man of God may be perfect, thoroughly furnished [equipped] unto all good works.” (2 Timothy 3:17) Those who say more “revelation” is needed, such as the “Pentecostals” false prophecies or gibberish tongues, demean the sufficiency and integrity of the Holy Bible. What God has said is complete, they say is incomplete.
8) These special gifts – the prophesyings, inspired foreign languages, healings, and other miraculous gifts – were signs given only to the apostles and to the churches they worked in, that is, the churches of what is called “the apostolic age.” John, the last apostle, died around the end of the 1st century. Paul called the miraculous gifts “signs of an apostle” (2 Corinthians 12:12). He refers to his own apostolic gifts – and credentials – in Galatians 3:5, and again in Romans 15:18, 19. When the apostles were taken from the world by their Lord, and the holy record of Scripture complete, no further revelation was needed or allowed.
9) The power of God was now in His inspired and infallible word contained in Scripture. The miraculous gifts of the apostles, both directly by them and indirectly by those in the churches they were the overseers of, were replaced by the power of the Holy Spirit through the word of God written in His Book. Hebrews 2:1-4 says clearly that we must give heed to the things spoken by the Lord and His apostles, whose words He had confirmed by many signs, wonders, miracles, and gifts. The time of this confirmation has passed, and the time for heeding the spoken word of the Son and His apostles has come. As Paul says, “How shall we escape, if we neglect so great salvation; which at the first began to be spoken by the Lord, and was confirmed unto us by them that heard Him…?” (Hebrews 2:3)
10) The Scripture attests to its own power and sufficiency when it says, “the gospel of Christ…is the power of God unto salvation to every one that believes” (Romans 1:16), and in 1 Corinthians 1:18 it is written, “The preaching of the cross is to them that perish foolishness; but unto us which are saved it is the power of God.” The Holy Spirit of power is most manifest in the preaching of the gospel of Christ, and in the preaching of His cross, whereon the Lord of glory suffered the eternal death deserved by us His people. The power of our God and His Christ is in the preaching the deep things of His glorious gospel as contained in His word. Jesus said to us, “The words that I speak unto you, they are spirit, and they are life” (John 6:63). His words in us are full of His power, and of His life. In the preaching of God’s word is His mighty power.
11) When a pentecostal grabs you and asks, “Have you been baptized in the Holy Ghost, and have you spoken in tongues?” You might answer, “Yes, the very moment I was saved by Him He baptized me with the Holy Ghost and fire (Matthew 3:11; John 3:5; Acts 2:38, 39; 5:32) as He promised, and by His Spirit He also baptized me into His Body, adding me to the church as one of His saved ones (1 Corinthians 12:13; Acts 2:47). As for tongues, the apostle Paul said that even in the early church not all spoke in tongues (1 Corinthians 12:30), so why are you asking me a question against the word of God?”
The genuine Holy Spirit – called also the Spirit of Christ (Romans 8:9; Philippians 1:19) – does not give so-called supernatural experiences and apostolic gifts in these days, but rather He reveals the risen Lord and Savior, showing us His excellent glory and grace, and helps us understand what He has accomplished for us by His redemptive works. The Holy Spirit (or Holy Ghost) is the Spirit of Christ, as it is written, “Now the Lord is that Spirit…” (2 Corinthians 3:17, 18). The Spirit of truth loves sound doctrine.
12) I would make it clear that when a pentecostal (or charismatic, as they are also called) talks to you about the false doctrines they hold, as though you should believe in them too or something is wrong with you, you should make it clear that you come from a church that honors the Bible above the ideas of men and deceptions of Satan, and honors the Lord Jesus Christ above some false ideas about the Holy Spirit (for the Holy Spirit does not speak of Himself, but He glorifies Christ – John 16:13, 14). You need to know your Bible, and the Biblical doctrines taught in this paper, so you can resist false teaching.
But please remember this: that many of the pentecostals are genuine Christian brothers and sisters, and they love Jesus even though they have bad errors about the faith. So we are to be gentle and patient with them, and ask them to come and talk with our pastors, elders or older Christians who might show them the truth, if we cannot do it ourselves.
If the pentecostals are “pushy” about their false teachings, please tell them to stop being “pushy” or you will have to walk away from them, for it is written, “Go from the presence of a foolish man, when you do not perceive in him the lips of knowledge.” (Proverbs 14:7)
)
), we don't see people speaking fluently in foreign tongues all of the sudden and without training... I would say those are extraordinary miracles whereas we do see other types of miracles such as you've described and those miracles are common, to a certain degree. 
