Building a stronger Stockwell