Fingering considerations - "Cadenza grandioso" in Liszt PC 1

[AvoidedCadence]

Thanks for your time in reading this.  Anyway, I've decided to study this summer Liszt's first concerto.  Accordingly, and thanks to the SCIENCE of practicing, I've got the first movement down comfortably - with one (two?) exceptions.  My problem is the "cadenza grandioso" of the first page and the corresponding passage in f# half-way through the movement.  I haven't been able to figure out a comfortable and convincing way to finger these chords.  I think it will take a long time to get this passage up to speed with any fingering combination, and some will make proper execution at tempo more difficult than others. 

I've considered the following:

i) I think it's necessary to play all chords with the outer octave fingering 1-5 or 5-1 (except maybe in the LH in the f# passage).

ii) I find it difficult and uncomfortable to play an inner note with the same finger in a different hand position.

Thus for example the right hand in f# major passage:

I can play it going up RH alone fine.  Going down the C#F#C#- A#C#A#-G#C#G# progression I find difficult to hit accurately, taking the 2nd finger on the inside of all these chords (then switching to the 3rd finger for all the root position F# chords) - it's the fact that the 2nd finger has to move relative to the hand is what makes it difficult, but I can't see 3 being a better finger for the first chord I mentioned.

Any suggestions for this passage or general principles?  Have I overlooked something obvious?

Once again, thanks for the help.