Does he enjoy competitions? For CS I think something like USACO would also move the needle. I wouldn’t push IB as long as he he has a path to get into a good CS program. It sounds like he has enough AP classes to make it work.
The great thing about CS is you don’t have to attend schools like MIT or CMU to do well.
Summer programs can also be a big help defining your kids interests. Good luck.