I know there are a few threads with similar problems, but I tried what they said, and am still having troubles. Excuse my non-technical terms. I kind of know what things do, but don't know the names of them all yet

As the titles says, when I change gear, I get 1 or 2 small jolts or judders, then speed up fine.
I unplugged the MAF, and didn't get the problem, but it did stall when the revs dropped (3 times while I was turning in an estate, had to jump out and plug it back in to get going, embarrasing times :s )
Idle is a little lumpy too.
I took the MAF sensor block off and had a look at the wires and channel which are perfectly clean, so can see that is not the problem.
Recently also changed:
Brake servo assist hose.
Small rubber hose that looks to go from intake to injector rail? (about 6 inches of cotton braded rubber hose on right of intake)
New spark plugs (not changed the leads yet tho)
Cleaned out the black rubber pipe that goes from the top of the engine to the tube from MAF to TB, and down to the front of the engine. That was pretty gunked up.
So, could it be a faulty MAF? It's a Hitachi, but not seen many around. Looks like it fixes to the filter box differently, but if I swapped out for a Boch (which seem more readily available), would it work (with adaption to filter)?
Many thanks.