At this point, it may be a good idea to throw the entire git porcelain (frontend) away and redesign it from scratch!