Doing NT Theology critically and canonically … the challenges!

I’m hoping to soon start working on a short NT Theology for IVP. I’ve toyed with many ideas on how to go about it. The normal way to go is book by book or corpus by corpus (Thielman; Marshall), or a historical origins approach (Morris), whereas others  go for common themes (Guthrie; Schreiner)

How does one set-up a NT theology if one is equally concerned with critical issues and canonical setting? Several big questions emerge:

Examine the books in historical order, canonical order, or take a corpus approach?
Any place for the historical Jesus and the early church prior to Paul’s letters?
Do we go for Synoptics + John (= Tetraevangelium) or Synoptics + Acts?
Or should Acts be placed with the General Letters in the proper Apostolos collection?
Paul’s letters, divide between disputed and undisputed?
Then there’s Hebrews, traditionally part of the Paulinium, but belongs more properly with the General Epistles!
Johannine Corpus, Gospel and Letters or Gospel, Letters, and Revelation?

At the moment I’m thinking:

Intro to NT Theology
The Historical Jesus
Primitive Confessions about Jesus
Paul’s Letters
Mark, Matthew, Luke-Acts
John
General Letters
Revelation
The Central Message of the NT

For those interested, I give my thoughts on NT theology in Michael F. Bird, “New Testament Theology Re-Loaded: Integrating Biblical Theology and Christian Origins,” Tyndale Bulletin 60.2 (2009): 265-291.