Its a Cow not a Dog
So...you're experiencing exactly what I've been struggling with - except I usually call ours the "cow" instead of a dog b/c it reminds me of a waterlogged bovine.
You are in luck...there are few suggestions:
1. Rig tuning - without a backstay your only way to change rig performance realtime is to adjust shrouds. For heavy breeze I tighten the uppers and loosen the lowers (lowers always should be hand tightened on the 216) to create visible bend in combination with a custom wooden mast wedge. This flattens the jib and the main accordingly. For light breeze/chop I typically loosen the uppers to straighten the mast and sag the headstay slightly. This creates a less flat sail and powers up to handle the lighter air and/or power through the chop. I don't use pins to lock the turnbuckles down so I can change tension during a race.
2. Use the controls. Ease the outhaul to create more main sail body. Play with the vang to get good shape. Keep the boom centered (when close hauled). Use your cunningham to control the luff tension. Use your leech and foot tension lines to create shape as well.
3. New sails. The stock 216 sails are very poorly made. Use the stock sail for practice/tooling around. I upgraded my jib to racing dacron and am adding a mylar/pentex triradial main. The main is almost done but the theory as I understand it is the lighter weight, better cut main will dramatically improve light air performance, translating the energy of the light wind into lift instead of deflecting the air, reducing lift. In heavy air, it reduces heeling and translates this to lift and speed b/c the better cut sail will not trap air and move you to leeward as much.
4. Add jib track leads to change the sheeting angle of the jib. This is huge. A tight leech is better in light air versus a tight foot. Vice versa for heavier air.
5. I know you said main/jib only - but the a-sail on the 216 is life. This is the only way I can come close to anyone (barring all other issues). I would never even come close with the jib on downwind legs unless it was blowing 15+ kts.
6. The rest is environmental, but I look at it as 50% tuning and 50% being in the right place. Look for the wind, follow the pressure, know the tide, know the currents, avoid the heap and bad air other boats are generating. Tack to the lifts and tack off the headers.
Pay attention to what Alan says on this forum - he knows a lot about racing and the theory behind how things should work...He helped me a ton get out of our rut.
Paul.