It all depends on whether or not you pay income tax already and if you do, at what rate. If you don't pay tax the best bet in my view is ICICI which is relatively straightforward to run once you have been accepted. You need a current account with a bank or BS to transfer funds in and out of but I guess you already have one of those. ICICI pays interest whilst the money is in your account and doesn't penalise you for the whole month if you need to withdraw money half way through. It also pays interest monthly and there is no minimum limit (£1.00). They seem a touch naive but try hard to please. The newly announced A&L at 5.35% looks good but you lose a month's interest if you draw money out during any month and they want at least £5k in your account. This is restrictive.
If you pay tax at 22% there are numerous cash ISA's arround which will give you 5% +/-, but, as you say, that only accounts for £3k of your £30K. Try your local Building Society if you can leave a reasonable portion in a bond for a year or two - they could be offering upto 5.4% if you qualify for "loyalty" savings. (ie Portman?).
But don't panic. All the indications are that interest rates will increase rather than decrease in the near future so hesitation might pay. Of course if you open an ICICI account you can put it all in now and move when a better deal comes along.
Happy Saving