I hope I am wrong, but I can't see you being allowed to "upgrade" to a product that Disney no longer sells. So adding features like Water Parks should work. But adding days is sort of like turning in your old ticket and being handed a new one (only they do it all electronically now). Since they don't have a 10 day No Expiration ticket to "hand you", I don't think they can upgrade you to that.