Since you only have a month to train it I would add events to the end of your workout every time you can instead of having a single events day. You need to practice moving with weight. Yoke is essential to train, farmers is preferable to train but you can get away with just doing lots of yoke and a bit of grip work. If your biggest problem is deadlift then concentrate all your gym work on that. You don't really need to be back squatting much, if at all. I would add assistance for your back and hamstrings that is easier to recover from so you can work your deadlift while still being fresh for your events. Also do whichever kind of curl is comfortable for something like 5x10 at the end of most of your sessions.
Keeping the same four days I'd do something like
Mon: press, event(s), reverse hypers, biceps
Tue: power cleans, glute ham raise, an event if you have the energy
Thur: deadlift, barbell rows, events, biceps
Fri: squat (intesity and volume naturally limited since you're doing it after thur), press