Keep the honors and AP programs (heck I didn't know there was a difference till now) but quit screwing around with the GPA. Not every college takes the inflation when calculating GPA.
Heck my JC has some honor courses and they don't get anything special besides bragging rights.