I did this once, and used two AA batteries for the dihedral – each battery was laying on its side under each wing. Perfact match since the batteries are the exact same size.
Incidence problem solved by using a 3/32″ or 1/8″ balsa fuselage. Don’t change the angle of the top where the wing will be, don’t change the angle on the bottom where the tail will be – you then have zero-zero incidence. I just made a nice curve from behind the wing back to the tail on the top of the fuse to make it look nice.
I hope this helps you.