Regarding Shear Webs
What you have done is quite sufficient, I would add no more. It is not particularly necessary for the shear webs to butt flush up against the ribs. The important part is a secure bond to the upper and lower wing spars. The grain of the shear webs should be vertical in respect to the spars.
Vince