If you have done FA cases in one way i.e. one case you are doctor and next case you are SP then I think it's better you switch roles and do those 31 cases again in the reverse manner.
I think FA practice cases are much better written than UWorld and repeating them is better.
If after finishing the reverse order you still have you may then do UWorld cases.