One of the better commentaries I've read. Kudos to you! Let me add a little about drunkenness from the TDNT. I'll post a link, but don't know if it will work...

From TDNT-
The fundamental difference between early Christian fullness of the spirit and the orgiastic enthusiasm of Hellenism is indicated in Eph. 5:18. The life and liturgy of Christians are not marked by sensual ecstasy or Bacchantic frenzy (μεθυσκεσθαι οινω) but by infilling with the Spirit (πληρουσθε εν πνευματι). The distinction could hardly be more succinctly expressed: orgiastic enthusiasm on the one side, and on the other the fullness of the Spirit which finds liturgical expression in praise and thanksgiving (5:18-20) and practical expression in αγαπη (5:21- 6:9). In this respect Paul emphasizes explicitly that the fact that μεθυσεσθαι is not the result of αγνωσια, as the Hermetic writings and Philo suppose, but of ασωτια, i.e. a corrupt and profligate nature.

https://christiancfellowship.wordpress.com/2016/08/26/drunkenness/