Jo
If you plan to activate enhancement package 5 or beyond then it could be worth waiting for the functionality to be delivered to you.
If you create a modification and implement the functionality it will increase the complexity of the Enhancement Pack upgrade in the future.
Personally I would wait if you can.