That sounds good to me! That sounds like a safe setup. I'd certainly hold off on the spacers until you see how they actually fit before determining how conservative or aggressive you wanna get with your spacing. Good luck with the transition!