There's a thread on best 17.5 motor around here somewhere if you wanted to go that route. Just me personally, I would run whatcha got and start racing next week or the following at the latest! 2-3 practice days and then go racing to get back into the environment and to get the blood pumping again. Then practice some more and more and more.