That is good progess in identifying where and where not the problem is.
Make sure to follow @mcs3ss2's suggesting. Many problems are easily fixed by running ALL upgrade options on the Advanced -> Upgrade page. Run #1 and watch for any errors, then run #2, #2B, #3, #4, & #5. Run each upgrade...