Sign the Type A. 1 yr deal. You'll get a Type A pick back when someone snags him late, with a lottery-ticket chance at a true #1 on top of that.
How cheap has the Type A gotten? If he's down to like $1.8m/yr and he's young enough, I might even give him a multi-yr deal as a backup. He's not a bad everyday starter at 2B against both sides. And several seasons of an excellent 30 PA backup at a good price is worth the 25th pick. Especially if you still get a comp piack back at the end of the contract.