The workouts mentioned are all good. The only thing missing is hill repeats.
On your last 400s you were hitting 66s with rest. That would tell me you are at 2:15 now. Always make the last 400 fastest. try only 3. 68, 65, 63,
to hit 64s you need hill repeats.
try 5x 31 second all out hills full recovery. then 10 min jog to the track. now finish the workout with 4 fast 200s 31s. this workout will help your speed to cover the 400 in 63
63 is your key pace because that's your first lap in your goal race. 63.5 and 66.0 sub 2:10
Reduce your mileage if you need to to get 3 quality workouts a week. It comes down to recovery so you can run fast. Any guy that says they ran a fast 800 with no speed work is bull. They might not be doing speed work now but somewhere in their training in the last 12 months they did speed work.