No, to get it perfect you need a Dyno or good data from EFILive/HPTuners to observe your HP curve. You want to stay in the highest part of the hp band when you grab that next gear. Depending on the transmission, you may fall back prior to peak torque. But torque isn't the name of the game with a WOT upshift, HP is.
Put another way: if you know you're going to lose 2000 RPM on a given upshift, you select your upshift points so that when you grab the next gear, you're at the bottom of the upper 2000 RPM that gives the most average HP.