06/05 Update - We have lift off.
Just finished assembly today and had a minor issue on the B+, I always measure parts from respective bins before I solder them in but this time round, I didn't bother as I just redid the bins - no need to say anything else.
Basic tests completed and pleased...