I have an '03 Tige 23V and I have found that my boat needs ballast in the rear. My hull is similar to yours, but not the same. With my hull, we have found that ballast in the bow or in the opposite corner drops the height without a corresponding increase in pocket length. We adjust the pocket length with speed. Typically we start with Taps set at 4 and then adjust higher through the day as we burn gas.
I have a custom sac made by the folks at Fat Sac that fills the rear locker and everything under the bench seat on the port side. Plus, we most typically have about 700 pounds of people ballast.
I don't like that curl on your wake. I think that you'll find adding some ballast to the port locker will smooth that out some. Once it goes past vertical, that's not usable, IMO. Set speed at about 10.5. Try one fat sac or equivalent in the rear locker, if that doesn't give you the desired shape, stack another sac on top of it. I would then locate folks inside the boat to affect the shape of the wake.
Two views of my 23V's wake. Also, there are some folks that share their setup at tigeowners.com, although I don't remember a specific surf setup for a 20V, you might check there though.