I think I'm going to keep the BvS one, skip the JL and go for the MoS2 Supes and get that and whoever the villain is in MoS2. The JL one potentially including a heat vision sculpt isn't enough to get me excited about it, as it wouldn't be anything that isn't already available for both BvS and MoS Supes. You can already purchase a few different types of heat vision sculpts for both respective figures.
Not wanting to be overly pessimistic but at this stage there is no guarantee MoS2 will be made. I feel that will depend heavily on how JL fares both critically and at the box office, especially Superman's role. Obviously Batman will get his solo and with Affleck directing I'd put money on it being great. Supes and the rest of the solos could be in danger if JL goes badly.
I'm crossing everything that first WW and JL are well received enough for this DCEU to go the distance.