The firetv is $35 and much better than the stick. If you stream a lot, it's a must upgrade over the stick.
As for YouTube TV and Amazon, I wouldn't expect their stupid war to end anytime soon. The current Firetv line is fully capable when it gets resolved.
Regarding the terrarium buffering, read my post above.