Ok, try this. The following is assuming that you did not remove the long shift shaft and it is properly installed into the shift shaft under the power head.
Make sure that the shift shaft on top, is aligned correctly to depress the neutral safety switch. The fact that it does not depress it is a concern, but you have to get all the alignment straight first.
Check out parts 12 and 18.
http://www.boats.net/parts/search/Honda/Outboard%20Engine/2004/BF150A4%20LA%20MARINE%20ENGINE%2C%20JPN%2C%20VIN%23%20BANJ-1000001%20TO%20BANJ-1099999/SHIFT%20SHAFT/parts.html
18 is the part that you would have just adjusted to align with the neutral safety switch.
12 is the part that is evidently out of alignment. Be sure that you can see where the long shaft goes into it. 12 and 18 are probably about 1/8 inches thick. As you can see, you probably have one of these (#12) all the way to one side.
Stick a needle nose plyers in the end of the long shaft with the flat part of the needle nose on the flat part of the shift shaft. That way you can see which direction the flat spot is without bending way over and you will have better control when you try to turn the shift shaft. You may want to have someone else with steady hands help you.
What you are going to do now is push the long shift shaft up just 1/8 inches...maybe a little more. This should make #12's teeth raise above $18's teeth. Be sure to watch under the engine so you do not push it in too far. You may need to grab it later with a needle nose to pull it back down. Just remember...the long shift shaft could come out at any time...and it will probably be the worst time.
While you are making sure the top shift shaft #18 is not moving, try to turn the long shift shaft (while still pushing it up 1/8 inch or so) until the flat spot is forward.
Gentle pull the long shift shaft back down, wiggling it back and forth a little so that the teeth of the two shift shafts link up. You may need to help pull it down where the long shaft connects to #12 with needle nose.
At this point you can very carefully move the upper shift shaft and see if it rotates both ways.
If you were successful...now the hard part. You have to put the e clip (#11) into position to hold the #12 in place. A long needle nose should be able to do it. As I said in a previous post, if this is indeed the problem, the e ring may still be on the shaft of the shift shaft but just pushed down the shaft. If so, you will have to pull it off and install it in the little grove on the shaft of #12.
Do everything is small increments so you do not loose the #12 into the bottom casing. Once you do, it is powerhead time.
I do hope we are going down the right path.
Mike