Jesus says that He will come to us as Comforter.     He is telling us that in every sense of the word He is with us by virtue of His Holy Spirit being in us and us in Him.     

Do not think of the Holy Spirit as a surrogate for Christ Jesus.     He is Christ Jesus.     

If you have not been filled with the Holy Spirit Of Christ Jesus, the Lord has not come to you as He desires and as you need.     

To be baptized with the Holy Spirit one must desire intimacy with Christ Jesus and not just a contractual relationship Luk 11:13.