Nice to meet you, welcome to the fold. I havent tried stovetop roasting; my experience is in the Heat Gun and colander/sieve area. There are some photos in the roasting folder. I get very even results, and the mess is easy to clean because its all out side, better for smoke too.
As for the grinder, if you make coffee you like, then stay with what you have, unfortunately, any improvement in equipment is going to cost you. Any of the electric chopper type grinders basically pulverise the bean. Unless you smash them to pieces every time, its difficult to consistently get the right grind size, because its all random contact.
Next level might be hand grinder, looks like an old jack in the box sort of thing, with a winder handle. You could try a couple of the specialty coffee shops around town.
From there, its in to the business end of the market. A decent conical burr grinder is going to set you back at least a few hundred sheckles. There are cheaper versions where the burr set-up varies, but they wont grind as well.
Having said that, there is the “for sales” folder to watch, related sites who specialise in coffee equipment and the good old classifieds.
Hope this helps