Indeed, nothing so disheartening than having your machine not work properly. I know that feeling with Jibril at the moment. I am the same with events, I can't make both days of events normally and it annoys me deeply. Grantham and Bolton were close enough for me to do both days but sadly, I couldn't get Azriel ready in time for the championship (besides, two championships this year is enough for me. :P)

The thing is, now it has been in the arena, you know where the weak spots are and so can work on them as you mention, you have at least one plan going. It'll come good in the end.