Dan,
welcome to the forum. We have spoken before on dyestat and through email.
Looking over your weight program i would most likely combine both since you said that your old program allows you to incorparate any other upper body lifts that you want. But remember what you did at your university worked great for you. So i like the old saying if it aint broke then dont fix it.
I personally do not like doing pushes and pulls on the same day but that is just me. Id like to see exactly how both these programs are periodized throughout each phase % wise. Id also like to see how it changes during the comp. phase. Id also like to see how it complements your track workouts. So if you have a chance to get into more detail im sure many minds on this forum will be able to help you further.
Participant