Since your pulling it apart, not a huge fan of milling the **** out of everything but you could get the decks and heads milled for cr bump, but that cost money so pistons start looking like an option etc..
In away I'd do a zero deck short block, even if you had to run it almost stock at 1st gives a good base to do performance upgrades on later.