Yes, that's what I am going to do. The frame I believe won't take a wheel bigger than 19" with 2.75" tire..
As for the battery, I was planning on staying on the 20s for space reasons, in my cad file the 20s10p will be tight and maybe a 24s that would be very good is too much for the space and...