What I understand is that you can squeeze an 8V 1.6, motor, tranny, & tc in front of your tc. To get the 16V 1.6 to fit you need to either body lift, or modify hood to get it to fit motor in; tranny, & tc will fit in front of your tc. Not sure of the 2.0, but you may need to move your tc back a couple of inches to squeeze it in front of it.
I do not remember whether you did a body lift with your build. I enjoyed the write up. Looking forward to this.