I think your pump drive gear might be 1 tooth out. The angled gears will turn the shaft as you insert it. Otherwise it all looks close. On the B16, #1 cylinder is at about 7.30 as per a clock and you can see the mark the the rotor should point at, on the rim just above the condenser, when adjusted to the static setting. After tweaking the advance/retard housing usually ends up approx parallel to the engine side.
That engine is going to look very nice under the hood!