If you have the time do it yourself...

Use a program like Winmerge, Ultra Compare or Beyond Compare..
When you load a add on that touches core .php files you have to munge the coding from the add on to the core .php file...
You just can't dump the .php file on top and race..

Just take you time and use the right tools of the trade and you will be fine...