It's been a while since I've posted, partly because my practice was minimal last week :-( but yesterday I introduced my right hand to the remaining fragments and today can play through the entire right hand (albeit painfully slowly in the new sections).
I think I'm going to try for the entire right hand at 30 bpm by Wednesday, 40 bpm by Christmas and 50 bpm by New Years.