Good thoughts, except for Firefox 'not doing great right now'. I've switched over for almost a year now, both for regular and development use, haven't looked back.
Then I got tired with certain sites not working properly and went back to Firefox - and it's plain to see they've done great things to the browser engine, it's fast, pretty lightweight on CPU and power usage and all of the problematic sites in Safari work fine.