Are all of the trim tabs gunna be operated independently? Doing it that way will give you the best chance to have a boat that goes straight and is predictable on plane since this is a sorta custom setup balance can be an issue. Just make sure that your transmitter is decent and has presets that can be changed for your trim tabs so that once you get it dialed in you can keep it there. With more motor and larger control surfaces i think you will be in good shape. Have you updated the prop? That is a huge factor as well.