That's definitely the one you want as it has some hardware fixes based on learning from the Braveheart version. It's just vanilla PinePhone hardware with the UBPorts logo on the enclosure and should be shipping later this month.