It looks like you are preparing well. Increasing your deck and moving up is working well. The new version of the game might make you rebuy some of those cards but let's hope that it won't happen.