Competition with Aftermarket Power When Consumers are Heterogeneous