Sell the tires and remaining good rims and upgrade. If upsizing is really what you want, you'll regret spending extra $$$ on a replacement rim just to reuse the tires.
On another forum, someone really wanted to upgrade, but decided to stick with stock-sized (but still aftermarket) rims so he...