Instead of the failed waiter-gig, Sherlock leaves John hints about his return in the form of roses. I'd love for John to be amused, maybe slightly creeped out, and not understanding the full meaning of the roses. Sherlock then proceeds to profess his love through explaining the colors and their meanings.

Please, no Mary or John/Mary.