You are absolutely right except that A and B should be exchanged in your most recent message. With a two-factor within-subjects design (AXBXS), the random effect of subject is indeed accounted as reflected in the main effect tests of A and B: MSA/MSAC and MSB/MSBC. I missed this point before.