A friend of mine has the same set up as you and he changed to 21" mercury Enertia and picked up 2-3 mph from his old 21". I think if you change to a 23" your motor will struggle to keep in wot rpm range. He also got improved holeshot. Tabs will help.
"more roll and squeal than a pig in a bap"