it is more likely to be the head than the block, but that is just a probability - did you got the head checked if it's warped when you changed the gasket? - it could be that it needs to be planed and maybe even the block is crooked, that depends on how much it overheated. Also, did you retorque the head after 500 miles or so? Did it show water in oil right away after you changed the cyl head gasket or it took some time to appear again? Do you get any bubbles in the coolant circuit and is it creating pressure in the cooling circuit? did you try running the engine w/o the radiator cap and see if the amount of water in the oil decreases?
answers to these questions can give some clues as in what's going on, for example if you get constant bubbles in the cooling circuit then it could be the following: the head cracked (in the chamber, usually between valves is where the crack would develop, but in your case with the overheating could be in other spots too), the head or block warped or the gasket not sealing or busted.
if you don't get bubbles then it could be the gasket between water circuit and oil return from the rockers under valve cover (that can also be due to warped head and/or block), could be a crack in the head or in the block.
Point is if you get constant bubbles if it is not due to gasket sealing properly due to reasons explained above including improper torquing of the bolts then it is the cylinder head (unless a cylinder is cracked which is unlikely with the engine still running fine as yours seems to).
I'm not ready to replace the engine, but is replacing the head a worthwhile endeavor?
i would take the cyl head off again and get it at least checked to see if the seating surface is flat - my guess, if you cannot see a crack on any of the chambers between the valves (clean the deposits off well, you should be able to see it if it's there), is that you need to get the surface machined so it's all leveled and will seat properly on the block - make sure that you torque it in sequence and re-torque (not sure when the 2.5 is required to be re-torqued, every motor has it's own requirement and torquing sequence and procedure for the cyl head, look in the FSM and follow the exact steps from there). You should also check the block as well, use a long straigh liner and a thickness gauge to see how much is curved - again check the FSM to see what is acceptable before requiring to be machined and in that case (and same for the head) make sure the shop where you do it will tell you how much they had to take off so you can get a proper thickness gasket if necessary.
Or what Fourbanger ^ suggested, and i assume they will also check the head if it's flat if not machine it for you anyway - only thing that i don't know is if the crack is internal or somewhere in a place that is not directly visible if they'll be able to tell
you can also try to use some hairline fracture penetrating spray to identify the crack