I am almost exactly your size. I tend to prefer boards between 140 and 143 cm. For freeriding, you could easily ride something as long as 145 cm if you wanted, which means the Never Summer Infinity 145 would be an excellent choice for you. Personally, I love my Never Summer Pandora 140: great edge control, easy to turn, and is a smooth, damp ride (considering that it's a park board).
The Ollie Pop is a great board, but if you want an upgrade from the Lux, consider the Eminence instead. It's a bit more aggressive and more high end, but still has the C2BTX.
I hear great things about the Fling and the OMG, but I doubt either would match BTX or Vario Grip (Never Summer) in edge control.