Your edit mostly got it right with the exception that it wasn't commonly called a T-1 or E-1 and the numbers are slightly off.
* ISDN BRI = two 64k B channels and one 16k D channel
* ISDN PRI over T1 = twenty three 64K B channels and one 64k D channel
* ISDN PRI over E1 = thirty 64k B channels and one 64k D channel (time slot 0 on the E1 was used as a sync channel and wasn't considered a B or D)
T1/E1 was considered an analog circuit with 24 or 32 respective 64kbps voice channels using in band signaling effectively limiting each channel to 56k. ISDN PRI used the same cabling and channel separation, but instead ran a digital circuit with out of band signaling enabling the full 64k to be available for voice and data. ISDN PRI (and BRI) also allowed the option to be packet based (similar to X.25) rather than circuit switched for data transmission.