Your 2.2Ω atty will produce 7.6 watts on a full charge and only 6.2 watts once voltage drops to 3.7v.
If you can find a 1.8Ω atty then you will produce 9.3 watts on a full charge and the same 7.6 watts (that you appear to enjoy) once voltage drops to 3.7v. (This is the least expensive route to dial in your sweet spot)
Because of your chosen wattage range, I would recommend a Kick. You can dial in a set-point anywhere between 5 and 10 watts and it won't matter what Ω atty you put on it (you won't be limited to a crappy brand that has the "right" ohms). You will get the same performance from the time you put a fully charged battery on, until it cuts off and needs charging.