Replace the fork and headset for threadless ones.

Having a fresh new un-cut steerer is a good thing, considering you want to raise your handlebars.

Plenty of adjustment that way, no ugly adaptors.