Ryou is a complete idiot. He should have just proceeded with turning Nagisa into a girl. She explicitly asked for that! Nagisa is already rather girly to begin with, so having her be a girl full time is the best option.
The status quo ending is lame and anti-climatic.