jFF
Are you into the board for another reason, like repairing something? Otherwise, I would leave the non electrolytic caps alone. That's just my opinion as lots of people like to do a rebuild and there is merit in that activity.
But if you must, keep the values as close as possible as big...