Yeah, that's a good way to do it.
IMO, PB should definitely be thought of/classified as a fat (a very healthful fat). As for whether you should count the carbs (and/or protein) that PB delivers...there are two schools of thought. Some folk like to track everything (I'm one of them). Others feel like, outside of being deep into a contest prep, macro-counting need not be as precise as that. I once did a cut with Shelby Starnes (well-known BBer/online training coach), and he had me only count the main macros in a food; ie, only the fat in PB, only the protein in chicken, only the carbs in rice, etc.
So, in short I think either way can work fine until you start trying to get contest-lean, at which time most people seem to need to maintain fairly meticulous control over their intake. (Disclaimer: I am not now, nor have I ever been, contest-lean.)