I forget which edition I first played this from.
I'm pretty sure it was not the Llobet edition.
It was the green-cover book
Pretty commonly used in music schools 15 years or so ago
I tried different right-finger combinations and somehow got stuck with p i m a i m i m
I play this occasionally for a warm up, due to the extensive use of right-hand arpeggios, and I often play without the repeating (last) four notes anyways, turning this into a strict arpeggio exercise.
Thanks for your comments.