If it is only your second meet, I doubt you are advanced enough to worry about a peaking cycle..
That being said, why not just train westside style and build speed and maximal strength at the same time?
I considered a similar setup to what you did, and I also have a meet april 16th, and just had one this past weekend.
My suggestion to you is to set up 4 training days per week.
Sunday: M.E. Squats/ Speed pulls after, then some assistance
Tuesday: Speed bench and assistance
Wed: Speed Squats and M.E. Deadlifts and assistance
Friday: M.E. Bench and assistance
or you could set it up where you have 3 days per week, one for each lift, start with speed work, then work up to a heavy single or double.
Either way works well, for raw or geared lifters.
Get your rep work and volume in with the assistance movements.