Yeah I wouldn't make any changes now. I am sure the 64bit client will introduce enough change to not warrant putting any effort in to anything substantial until after it comes out.