Here's my suggestion. Don't touch Yogyakarta. Don't change anything. Change everything else, instead. That is, grant special status to each and every other province in the republic. Then, let the people decide if they want a king or a governor or whatever.
To borrow from Gus Dur, "gitu aja kok repot".