The documentation on bridging is a little sparse. Especially for 2.0.X where bridging changed somewhat.
http://doc.pfsense.org/index.php/Interface_Bridges
It is my understanding that your second description is the correct way to bridge interfaces in 2.0. However if it's working for you…. ;)
If you do reconfigure your interfaces as described it's worth noting that since you can now assign a bridge interface, like any other, you can choose to have firewall filtering either on the bridge interface itself or on the member interfaces.
By default filtering is on the member interfaces which is suitable for a transparent firewall for example. However if you wish to bridge interfaces simply as a convenient way of connecting network segments, to connect a wifi AP say, then you can filter on the bridge interface instead. To do this you need to change two values in: System: Advanced: System Tunables:
net.link.bridge.pfil_member and net.link.bridge.pfil_bridge.
This is as I understand it from my own testing and reading other posts but I'd love to hear from one of the developers on this.
Steve