Congrats! Square-1 isn't as bad as you think. I was literally in the same position as you like 2 years ago, but now I love it!First sub 6m on 5x5 : 5m45.26s.
Also, my Square-1 is finally back in its solved state... but only through disassembling it. And that was almost as bad as trying (futilely) to solve it! Lots of sticky tape involved to stop it exploding when trying to put pieces back.