Emission question

[briogio]

In the summer I put a Japanese VTEC-E engine in my car, but the shop that put it in didn't put an EGR valve and put a P08 ECU, instead of the correct P07, also they put a 4 into 2 exhaust manifold(Si?) and a 4 wire O2 sensor. What I need to know is should I take my Canadian emission test with this set up or put all the correct stuff for this engine; P07 ECU, stock exhaust manifold with Cat, 5 wire O2 sensor, EGR valve and solenoid (I have it all now). Which set up will give me less emissions for the test?
Your knowledge would be very much appreciated, thanks