The worst thing about bike lanes is the conflict they cause at intersections (they encourage right and left hooks). So if you must have bike lanes, it is proper to end the bike lanes before intersections. As you properly did, cyclist should move into the through lane through the intersection, even if a bike lane exist through the intersection.

Good luck on educating the bus driver.