Those are good options.
Personally, if my laptop broke today, I'd order a gently used commercial grade laptop over a brand new consumer grade laptop. You may get more bang for your buck if you're open to used commercial grade options like Dell Latitude (I have an e6430) or IBM/Lenovo Thinkpads (T420).