I think you've got it! Here's a trick that I learned somewhere............ Before you remove the old timing belt, set the crank at TDC with the cams aligned properly and mark the old belt with paint or whatever at the timing marks. Then after you remove the old belt transfer these marks to the new belt. With the marks on the new belt, you can be sure that the new belt is installed correctly. I did this mainly because I didn't have the alignment tool for the camshafts but it worked great
Good luck!