Actually the poor results of the last GE disrupted PAP's original plan. Had they won with a bigger margin, the pecking order of the upper echelons of PAP would look like this:
Lee Kuan Yew Senior Minister Mentor
Goh Chok Tong Minister Mentor
Lee Hsien Loong PM then Senior Minister (after his son Lee Hong Yi becomes PM)