Thank-you Nik for posting content to this forum. Actually, the Pali term 'Viriya' is a Sanskrit term and it is related to our term 'virtue' which is not a wholesome behavior, nor an 'effort.' Virtue, Viriya, is a spiritual attainment or quality that one can accumulate through leading a rigorous, self-aware contemplative life. So, Supramundane Viriya is Energy, or kundalini are related terms. When one experiences a powerful surge of energy while in deep meditation, this is Virtue, Viriya, arising, which is Supramundane Viriya. It is self-arising. Whereas, effort of any kind is mundane effort.
While you have Concentration for Ekagatta, or one pointedness, correct, the translators of Buddhist literature for the most part got it wrong. They commonly translate the Sanskrit term 'samadhi' as concentration, so one can make the mistake of inferring that if concentration is read in a translation of the Buddha damma, then it must be a translation for Ekagatta, but in most cases it is not. It is an incorrect translation for the Sanskrit term 'samadhi', which means one will have to correct the translation on the fly to "ecstasy, religious experience, or absorption."
So, on your list of the "Eight Path Factors - Ariyo atthangiko maggo," since they read like the Noble EIghtfold Path, then I would guess that the 8th fold should read "8. Right absorption - samadhi."
Also, I believe What the Buddha said just before His final Nibbana :
"All conditioned things ("are" not "me") subject to decay; Strive on for your own salvation with diligence!"