Reversion strategy when upgrading MySQL
DO NOT DO #1 AS STATED! -- There are several vital files you have left out.  Capturing the entire mysql tree, plus my.cnf, would suffice.

And #2 is no better!

Without ibdata1, you have lost everything.