It is correct that, on the new trains, all the club and classic rooms have two beds. Both club and classic can be sold as either twin or solo - it depends on what the customer books, not how they are set up before they are booked. Once they are booked then the new trains can be correctly configured if they are booked as solo, simply by folding the bed up.
To be clear, there will no longer be rooms that must be permanently set up as solo or twin. They can be flexed on the night as customer bookings for that night dictate.