Hi Wolski and welcome to Coffeesnobs
Your suggested changes are great ones, and the best thing you can do after that is buy yourself a reasonable grinder and grind the beans just before you use them - thats where youll notice huge improvements in flavours in the cup.
Remember - best to use roasted beans within 3 weeks of the roasting date.
Best to use ground coffee within 3 minutes of it being ground for best flavour!
Enjoy the coffee journey!