by looking this over, i would say it might be better just to do the thrice weekly test prop injections all the way through since you are doing NPP anyway. if i were to make any changes (not to say that the current set-up is terrible), it would look like this:

1-8 tbol 60mg/day
1-14 test prop 500mg/wk
1-14 NPP 450mg/wk
12-15 prohormone
16-19 pct (pct looks perfect the way you have it)