Excellent diagram. We would also recommend using tees for all those couplings, and using crosses for tees. Point the tees upward for when you need to add taps into the main line at some later date. Someday in the future you will be glad you did.
Mar-Ktech