That sounds like a reasonable plan.
Remember - play the $% out of it when you get it, get to know it, learn its strenghts and weaknesses and if the worst comes to the worst I think you have a week to change it, free of charge. Might be 2 weeks. But not sure. Work on the assumption that its a week.
P.S. Thanks for saying thats tight - thats sloppy as hell. You should hear it when its properly locked in. Which you may well do, soon enough; track incoming, just need to rewrite a few parts I dont like any more.