Although I agree with the sudden ending of YuiXHinata, you can't deny that they've always been together ever since the baseball game. Regarding the plan I thought that it was quite fitting because sometimes it takes an idiotic plan to trick an idiot.
+points for Kanade when she went "ahhh" and tossed the guitar, that was golden acting.