BWAHAHAHAHA! You are AWESOME and AMAZING! This is TOTALLY what should have happened on Show, instead of the whole "YAY no gayness!!" bullshit they tried to propagate. You have it right: he got attracted to someone he thought was a boy, he did soul-searching and decided he was bi, so that can't just go away with the first flash of boobies!
Also, A scream akin to something a Victorian lady might make when informed what was expected of her on the wedding night = WIN!!!
And he's going to find Lukas now??? *bouncebounce* Sequel??