I would say no to Bam or Auq being the ultimate 1.8t, it's a small port head and if one was to try build a quarter mile drag car they would have no use for the standard Bam internals, VVT, standard management or k04 and they would want a large port head instead.
As I said, no one engine code is absolutely superior in every scenario. I do not believe the above scenario is true of the OP, that's why I would suggest he just chooses the engine with the same type of throttle body as what his one is now.