Stick with the #2 but I'd go shorter than 25". Everything else looks perfect to me.