Gary,
I'll be interested to follow your log and see you progress towards your meet. I am doing the NASA Unequipped (raw) South Texas State meet on May 23 here in Houston.
I like your set up for your template. Simple and to the point. I might make a suggestion however in unsticking your bench. You might try something like the following:
Day 1 -
Bench (heavy) - 5x5
Incline 2 x 6-8 (instead of light presses)
Rows
Day 2 -
DE Bench 8-10 x 3 x 50-60% 1rm
Press (heavy) 5x5
Pull Ups
Working on driving up my incline bench took my bench from 335 to 365 two years ago, and incorporating speed benches took it from 365 to 385. I think you will find the addition of inclines to the program as opposed to a second pressing session will have a more positive effect on your benching, especially as a raw lifter. The same holds true for a speed day as oppossed to another light bench day.