@kallepetter Sorry for a late reply.
I ended up going with a higher voltage rated replacement for Q15:
https://www.mouser.com/ProductDetail/522-ZXTN19100CFFTA
This is the stock one:
https://www.mouser.com/ProductDetail/621-ZXTN25040DFHTA
For Q12, I got these:
https://www.mouser.com/ProductDetail/595-CSD19536KTT