Was B&B’s massive plot twist just a con job?

Yes! They've basically untwisted their own plot twist.

No! The twist is still alive as long as Finn is.

B&B conned their audience but it resulted in quality TV, so all the power to them!