I don't know about the flying side, but you do only need to do POF(H), of the CPL(H) or ATPL(H) variety (they will accept both - the only reason for doing one or the other is the frequency of exams).
I don't think it will change in April.
On a side note, if you later want to upgrade to ATPL(H), once you have the experience, you can claim an exemption from the IR(H) based on your ATPL(A). It would appear that the combination of CPL(H) + IR(H) = ATPL(H) TK will still be valid.
Phil