1. Either is possible. If everything is in the past and the sequence is unimportant, then the simple past is, well, simpler. If it is important to place the happening before the saying, then use the pluperfect.
2. Either is correct grammatically, but the original is unambiguous, shorter and more natural.