I think that will significantly uncomplicate your life. I've never had CBP at MIA, DFW, ORD or JFK genuinely try to enforce California laws, but as stated above, it's usually the entry state that counts (though I think as long as we aren't trying to get away with something like duties evasions they are not going to get tough on us).

Only time I saw any hassle was arriving fro MEX at SAT - the Customs guy would not allow the chap to enter US / TX with his booty of whiskey, so the chap raided the paper cups and handed out free whiskey to arriving passengers rather than allowing Customs to confiscate it.