LOL, I am not laughing at you, I am laughing at the fact I saw my nephew do similar things and my son getting to that stage. I think it is that stage of growth where blame, fault, punishment and understanding all collide! Having a father as a BPD doesn't help, but as long as you ease your son through the rights and wrongs of the situation, he will learn. I think you handled it perfectly! Having him help clean, I think is important too... . teaches that making mistakes has consequences!
I am still laughing. I remember my 4 year old nephew missing the toilet and was insistent that it was his dads fault!
,