The only people that "do this in 15 minutes" are those who a) have little to no mods / changes to a default install or b) have tons of problems when upgrade is done.

The best advice you have is grab a cup o' joe, a copy of WinMerge or Beyond Compare and both file sets and dig in. Unfortunately with a customized cart there isn't an "easy way" to do it.

Hope that helps!