I have the same problem, but couldn't solve it with the mentioned solutions.
When I went to defeat the Elite 4 I saved (savestate) everytime before I had to fight one of
each. I now have 5 savestates (1st: AFTER LANCE) (2nd: BEFORE LANCE) (3rd: BEFORE that), ETCETERA...
After defeating Lance and ...