Let's see...your right, the courting wouldn't exactly go anywhere with their personalities. I think them just waking up, thinking they were in love this whole time would make it more interesting for them both, especially since Shiki has a tendency to be very bashful and tsuntsun around the object of her affection. Any sort of praise or compliment or teasing remark will be met with glares, mumbling, and blushing~

So yes, the always in love option would probably work best!