Are you sure this is the problem? Firewater doesn't work on all phones, regarding of OTAs. Does it give you the 'whelp' message, does it exit abruptly or what else? In the first case it shouldn't depend on the OTA.
Current phone: HTC One (M8)
HTC HD2 (Dec 2010 - Apr 2014; thank you Leo!)
HTC Touch HD (Dec 2008 - Dec 2010)
HTC Touch Cruise (May 2008 - Sep 2008 [stolen])
Previously: Nokia 6630, Nokia 3510