I personally like the way it is set up now because it can be very easy to blindly follow the hint and not focus on the entire context of the sentence. (guilty of it especially when I am trying to clear my reviews and subconsciously avoid reading the entire sentence)
I failed those keigo questions a few times too but as a result, I think it managed to drill in those nuances better.