Ahhh, the time old Deadlift dilemma.

You may want to try moving the deadlift to light day (again), but actually do it light. Try, perhaps, 5 singles or so at 50-70% percent somewhere. Just get some work in, without fatiguing yourself, in order to re-inforce technique. Wednesday becomes "technique day" for squats and deadlifts. Light practice.

On PR day, you could alternate like you suggested. You could also do 3 weeks waves; 3RM, 2RM, 1RM, switch lifts. Keep trucking along with squats on monday.

Like Eric said, there's no real clear cut solution to this. The above is just an option.

Cheers,
Jeff