Not OP, but I can't help feeling that a basic strategy pattern implementation might have been the happy medium here. The code would have been quite a bit simpler.