Thanks for the update. Can you remind us what power valve you started with?
Glad it helped you out. Late opening power valve timing can put a big hole in the fuel curve and you almost can't tune it out with pump cams and squirters.
EDIT: if you are still rich at cruise, drop the main jets a bit more to clean up the cruise. Then, when testing for WOT, it may be lean. If that is the case, don't touch the main jets. You open up the power valve channel restricters to make up for the fuel at WOT. Once you get the hang of it, you'll be helping anyone who will listen. Most won't.