HGV driver who assaulted ex-partner and police officer resentenced