Excellent, thanks! SN 46.3 is a nice version indeed. To put up a very simple equation of dhamma-aspects
jhana ------------ bojjhangas--------- ‘5 steps to samadhi’
1.vitakka ----------sati --------------- [meditation object]
1.vicara ----------- dhamma vicaya
[1.vivicca?]-------- viriya
— x ----------------- x ----------------- pamujja
1+2.piti ------------ piti ---------------- piti
— x --------------- passaddhi --------- passaddhi
2.(+1+3) sukha ------- x --------------- sukha
2.samadhi -------- samadhi ----------- samadhi
4.(+3) upekkha — upekkha