Assuming you're going to paint it all again, I wouldn't remove anything. Lay a half course in the bottom, and lay the next 2 courses in full block. Tool the joints that should be and flush the joints that shouldn't. If you want, grind the bond joints into the lintel/header every 16" to mimic the block bond below.