You could always borrow the soldering iron! Although it can be a good thing to own for various other projects.
I think if you still like your P2 you should just try to fix it
If you wait for S9 price to drop (which it probably won't) you will be waiting long enough to see new players develop that trump the S9 to the point you no longer want it. Although I got a good price on 32gig S9 from newegg.ca for just under 300 CAD (before tax), supposedly '70 dollars off.' If that sounds good to you then maybe you should check them out